Removed extra file [skip ci]

.github/workflows/build.yml

@@ -40,21 +40,13 @@ jobs:
           sudo apt-get install libipc-run-perl
       - run: make prove_installcheck
   mac:
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-latest
     if: ${{ !startsWith(github.ref_name, 'windows') }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - postgres: 16
-            os: macos-14
-          - postgres: 14
-            os: macos-12
     steps:
       - uses: actions/checkout@v4
       - uses: ankane/setup-postgres@v1
         with:
-          postgres-version: ${{ matrix.postgres }}
+          postgres-version: 14
       - run: make
         env:
           PG_CFLAGS: -DUSE_ASSERT_CHECKING -Wall -Wextra -Werror -Wno-unused-parameter
@@ -62,19 +54,13 @@ jobs:
       - run: make installcheck
       - if: ${{ failure() }}
         run: cat regression.diffs
-      # Homebrew Postgres does not enable TAP tests, so need to download
       - run: |
           brew install cpanm
           cpanm --notest IPC::Run
-          wget -q https://github.com/postgres/postgres/archive/refs/tags/$TAG.tar.gz
+          wget -q https://github.com/postgres/postgres/archive/refs/tags/REL_14_10.tar.gz
-          tar xf $TAG.tar.gz
+          tar xf REL_14_10.tar.gz
-          mv postgres-$TAG postgres
+      - run: make prove_installcheck PROVE_FLAGS="-I ./postgres-REL_14_10/src/test/perl" PERL5LIB="/Users/runner/perl5/lib/perl5"
-        env:
+      - run: make clean && /usr/local/opt/llvm@15/bin/scan-build --status-bugs make
-          TAG: ${{ matrix.postgres == 16 && 'REL_16_2' || 'REL_14_11' }}
-      - run: make prove_installcheck PROVE_FLAGS="-I ./postgres/src/test/perl -I ./test/perl"
-        env:
-          PERL5LIB: /Users/runner/perl5/lib/perl5
-      - run: make clean && $(brew --prefix llvm@15)/bin/scan-build --status-bugs make
         env:
           PG_CFLAGS: -DUSE_ASSERT_CHECKING
   windows:

CHANGELOG.md

@@ -1,12 +1,6 @@
 ## 0.7.0 (unreleased)
 
-- Added support for bit vectors to HNSW
+- Added `intvec` type
-- Added `hamming_distance` function
-- Added `jaccard_distance` function
-- Added `quantize_binary` function
-- Added `subvector` function
-- Added concatenate operator for vectors
-- Updated comparison operators to support vectors with different dimensions
 
 ## 0.6.2 (2024-03-18)
 

Makefile

@@ -3,8 +3,8 @@ EXTVERSION = 0.6.2
 
 MODULE_big = vector
 DATA = $(wildcard sql/*--*.sql)
-OBJS = src/bitvector.o src/hnsw.o src/hnswbuild.o src/hnswinsert.o src/hnswscan.o src/hnswutils.o src/hnswvacuum.o src/ivfbuild.o src/ivfflat.o src/ivfinsert.o src/ivfkmeans.o src/ivfscan.o src/ivfutils.o src/ivfvacuum.o src/vector.o
+OBJS = 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/vector.o
-HEADERS = src/vector.h
+HEADERS = src/intvec.h src/vector.h
 
 TESTS = $(wildcard test/sql/*.sql)
 REGRESS = $(patsubst test/sql/%.sql,%,$(TESTS))
@@ -12,7 +12,7 @@ REGRESS_OPTS = --inputdir=test --load-extension=$(EXTENSION)
 
 OPTFLAGS = -march=native
 
-# Mac ARM doesn't always support -march=native
+# Mac ARM doesn't support -march=native
 ifeq ($(shell uname -s), Darwin)
 	ifeq ($(shell uname -p), arm)
 		# no difference with -march=armv8.5-a

Makefile.win

@@ -1,10 +1,10 @@
 EXTENSION = vector
 EXTVERSION = 0.6.2
 
-OBJS = src\bitvector.obj src\hnsw.obj src\hnswbuild.obj src\hnswinsert.obj src\hnswscan.obj src\hnswutils.obj src\hnswvacuum.obj src\ivfbuild.obj src\ivfflat.obj src\ivfinsert.obj src\ivfkmeans.obj src\ivfscan.obj src\ivfutils.obj src\ivfvacuum.obj src\vector.obj
+OBJS = 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\vector.obj
-HEADERS = src\vector.h
+HEADERS = src\intvec.h src\vector.h
 
-REGRESS = bit_functions btree cast copy hnsw_cosine hnsw_hamming hnsw_ip hnsw_jaccard hnsw_l2 hnsw_options hnsw_unlogged ivfflat_cosine ivfflat_ip ivfflat_l2 ivfflat_options ivfflat_unlogged vector_functions vector_input
+REGRESS = btree cast copy functions input ivfflat_cosine ivfflat_ip ivfflat_l2 ivfflat_options ivfflat_unlogged
 REGRESS_OPTS = --inputdir=test --load-extension=$(EXTENSION)
 
 # For /arch flags

README.md

@@ -221,19 +221,7 @@ Cosine distance
 CREATE INDEX ON items USING hnsw (embedding vector_cosine_ops);
 ```
 
-Hamming distance - unreleased
+Vectors with up to 2,000 dimensions can be indexed.
-
-```sql
-CREATE INDEX ON items USING hnsw (embedding bit_hamming_ops);
-```
-
-Jaccard distance - unreleased
-
-```sql
-CREATE INDEX ON items USING hnsw (embedding bit_jaccard_ops);
-```
-
-Vectors with up to 2,000 dimensions can be indexed, or bit vectors with up to 64,000 dimensions.
 
 ### Index Options
 
@@ -711,9 +699,6 @@ Also, note that `NULL` vectors are not indexed (as well as zero vectors for cosi
 
 ## Reference
 
-- [Vector](#vector-type)
-- [Bit](#bit-type)
-
 ### Vector Type
 
 Each vector takes `4 * dimensions + 8` bytes of storage. Each element is a single-precision floating-point number (like the `real` type in Postgres), and all elements must be finite (no `NaN`, `Infinity` or `-Infinity`). Vectors can have up to 16,000 dimensions.
@@ -725,7 +710,6 @@ Operator | Description | Added
 \+ | element-wise addition |
 \- | element-wise subtraction |
 \* | element-wise multiplication | 0.5.0
-\|\| | concatenate | unreleased
 <-> | Euclidean distance |
 <#> | negative inner product |
 <=> | cosine distance |
@@ -738,8 +722,6 @@ cosine_distance(vector, vector) → double precision | cosine distance |
 inner_product(vector, vector) → double precision | inner product |
 l2_distance(vector, vector) → double precision | Euclidean distance |
 l1_distance(vector, vector) → double precision | taxicab distance | 0.5.0
-quantize_binary(vector) → bit | quantize | unreleased
-subvector(vector, integer, integer) → vector | subvector | unreleased
 vector_dims(vector) → integer | number of dimensions |
 vector_norm(vector) → double precision | Euclidean norm |
 
@@ -750,23 +732,26 @@ Function | Description | Added
 avg(vector) → vector | average |
 sum(vector) → vector | sum | 0.5.0
 
-### Bit Type
+### Intvec Type
 
-Each bit vector takes `dimensions / 8 + (5 or 8)` bytes of storage. See the [Postgres docs](https://www.postgresql.org/docs/current/datatype-bit.html) for more info.
+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.
 
-### Bit Operators
+### Intvec Operators
 
 Operator | Description | Added
 --- | --- | ---
-<~> | Hamming distance | unreleased
+<-> | Euclidean distance | 0.7.0
-<%> | Jaccard distance | unreleased
+<#> | negative inner product | 0.7.0
+<=> | cosine distance | 0.7.0
 
-### Bit Functions
+### Intvec Functions
 
 Function | Description | Added
 --- | --- | ---
-hamming_distance(bit, bit) → double precision | Hamming distance | unreleased
+cosine_distance(intvec, intvec) → double precision | cosine distance | 0.7.0
-jaccard_distance(bit, bit) → double precision | Jaccard distance | unreleased
+inner_product(intvec, intvec) → double precision | inner product | 0.7.0
+l2_distance(intvec, intvec) → double precision | Euclidean distance | 0.7.0
+l1_distance(intvec, intvec) → double precision | taxicab distance | 0.7.0
 
 ## Installation Notes - Linux and Mac
 

sql/vector--0.6.2--0.7.0.sql

@@ -1,41 +1,92 @@
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "ALTER EXTENSION vector UPDATE TO '0.7.0'" to load this file. \quit
 
-CREATE FUNCTION quantize_binary(vector) RETURNS bit
+CREATE TYPE intvec;
+
+CREATE FUNCTION intvec_in(cstring, oid, integer) RETURNS intvec
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
-CREATE FUNCTION subvector(vector, int, int) RETURNS vector
+CREATE FUNCTION intvec_out(intvec) RETURNS cstring
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
-CREATE FUNCTION vector_concat(vector, vector) RETURNS vector
+CREATE FUNCTION intvec_typmod_in(cstring[]) RETURNS integer
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
-CREATE OPERATOR || (
+CREATE FUNCTION intvec_recv(internal, oid, integer) RETURNS intvec
-	LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_concat
+	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 hamming_distance(bit, bit) RETURNS float8
+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 l2_norm(intvec) RETURNS float8
+	AS 'MODULE_PATHNAME', 'intvec_l2_norm' 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 jaccard_distance(bit, bit) RETURNS float8
+CREATE FUNCTION intvec_negative_inner_product(intvec, intvec) RETURNS float8
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
-CREATE OPERATOR <~> (
+CREATE FUNCTION intvec(intvec, integer, boolean) RETURNS intvec
-	LEFTARG = bit, RIGHTARG = bit, PROCEDURE = hamming_distance,
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-	COMMUTATOR = '<~>'
+
+CREATE FUNCTION array_to_intvec(integer[], integer, boolean) RETURNS intvec
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE CAST (intvec AS intvec)
+	WITH FUNCTION intvec(intvec, integer, boolean) AS IMPLICIT;
+
+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 <%> (
+CREATE OPERATOR <#> (
-	LEFTARG = bit, RIGHTARG = bit, PROCEDURE = jaccard_distance,
+	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_negative_inner_product,
-	COMMUTATOR = '<%>'
+	COMMUTATOR = '<#>'
 );
 
-CREATE OPERATOR CLASS bit_hamming_ops
+CREATE OPERATOR <=> (
-	FOR TYPE bit USING hnsw AS
+	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = cosine_distance,
-	OPERATOR 1 <~> (bit, bit) FOR ORDER BY float_ops,
+	COMMUTATOR = '<=>'
-	FUNCTION 1 hamming_distance(bit, bit);
+);
 
-CREATE OPERATOR CLASS bit_jaccard_ops
+CREATE OPERATOR CLASS intvec_l2_ops
-	FOR TYPE bit USING hnsw AS
+	FOR TYPE intvec USING hnsw AS
-	OPERATOR 1 <%> (bit, bit) FOR ORDER BY float_ops,
+	OPERATOR 1 <-> (intvec, intvec) FOR ORDER BY float_ops,
-	FUNCTION 1 jaccard_distance(bit, bit);
+	FUNCTION 1 intvec_l2_squared_distance(intvec, intvec);
+
+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);
+
+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);

sql/vector.sql

@@ -1,7 +1,7 @@
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION vector" to load this file. \quit
 
--- vector type
+-- type
 
 CREATE TYPE vector;
 
@@ -29,7 +29,7 @@ CREATE TYPE vector (
 	STORAGE   = external
 );
 
--- vector functions
+-- functions
 
 CREATE FUNCTION l2_distance(vector, vector) RETURNS float8
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
@@ -58,13 +58,7 @@ CREATE FUNCTION vector_sub(vector, vector) RETURNS vector
 CREATE FUNCTION vector_mul(vector, vector) RETURNS vector
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
-CREATE FUNCTION quantize_binary(vector) RETURNS bit
+-- private functions
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION subvector(vector, int, int) RETURNS vector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- vector private functions
 
 CREATE FUNCTION vector_lt(vector, vector) RETURNS bool
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
@@ -105,10 +99,7 @@ CREATE FUNCTION vector_avg(double precision[]) RETURNS vector
 CREATE FUNCTION vector_combine(double precision[], double precision[]) RETURNS double precision[]
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
-CREATE FUNCTION vector_concat(vector, vector) RETURNS vector
+-- aggregates
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- vector aggregates
 
 CREATE AGGREGATE avg(vector) (
 	SFUNC = vector_accum,
@@ -126,7 +117,7 @@ CREATE AGGREGATE sum(vector) (
 	PARALLEL = SAFE
 );
 
--- vector cast functions
+-- cast functions
 
 CREATE FUNCTION vector(vector, integer, boolean) RETURNS vector
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
@@ -146,7 +137,7 @@ CREATE FUNCTION array_to_vector(numeric[], integer, boolean) RETURNS vector
 CREATE FUNCTION vector_to_float4(vector, integer, boolean) RETURNS real[]
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
--- vector casts
+-- casts
 
 CREATE CAST (vector AS vector)
 	WITH FUNCTION vector(vector, integer, boolean) AS IMPLICIT;
@@ -166,7 +157,7 @@ CREATE CAST (double precision[] AS vector)
 CREATE CAST (numeric[] AS vector)
 	WITH FUNCTION array_to_vector(numeric[], integer, boolean) AS ASSIGNMENT;
 
--- vector operators
+-- operators
 
 CREATE OPERATOR <-> (
 	LEFTARG = vector, RIGHTARG = vector, PROCEDURE = l2_distance,
@@ -197,10 +188,6 @@ CREATE OPERATOR * (
 	COMMUTATOR = *
 );
 
-CREATE OPERATOR || (
-	LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_concat
-);
-
 CREATE OPERATOR < (
 	LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_lt,
 	COMMUTATOR = > , NEGATOR = >= ,
@@ -253,7 +240,7 @@ CREATE ACCESS METHOD hnsw TYPE INDEX HANDLER hnswhandler;
 
 COMMENT ON ACCESS METHOD hnsw IS 'hnsw index access method';
 
--- vector opclasses
+-- opclasses
 
 CREATE OPERATOR CLASS vector_ops
 	DEFAULT FOR TYPE vector USING btree AS
@@ -301,30 +288,106 @@ CREATE OPERATOR CLASS vector_cosine_ops
 	FUNCTION 1 vector_negative_inner_product(vector, vector),
 	FUNCTION 2 vector_norm(vector);
 
--- bit functions
+-- intvec type
 
-CREATE FUNCTION hamming_distance(bit, bit) RETURNS float8
+CREATE TYPE intvec;
+
+CREATE FUNCTION intvec_in(cstring, oid, integer) RETURNS intvec
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
-CREATE FUNCTION jaccard_distance(bit, bit) RETURNS float8
+CREATE FUNCTION intvec_out(intvec) RETURNS cstring
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
-CREATE OPERATOR <~> (
+CREATE FUNCTION intvec_typmod_in(cstring[]) RETURNS integer
-	LEFTARG = bit, RIGHTARG = bit, PROCEDURE = hamming_distance,
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-	COMMUTATOR = '<~>'
+
+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 OPERATOR <%> (
+-- intvec functions
-	LEFTARG = bit, RIGHTARG = bit, PROCEDURE = jaccard_distance,
+
-	COMMUTATOR = '<%>'
+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 l2_norm(intvec) RETURNS float8
+	AS 'MODULE_PATHNAME', 'intvec_l2_norm' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+-- intvec private functions
+
+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;
+
+-- intvec casts
+
+CREATE CAST (intvec AS intvec)
+	WITH FUNCTION intvec(intvec, integer, boolean) AS IMPLICIT;
+
+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 CLASS bit_hamming_ops
+CREATE OPERATOR <#> (
-	FOR TYPE bit USING hnsw AS
+	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = intvec_negative_inner_product,
-	OPERATOR 1 <~> (bit, bit) FOR ORDER BY float_ops,
+	COMMUTATOR = '<#>'
-	FUNCTION 1 hamming_distance(bit, bit);
+);
 
-CREATE OPERATOR CLASS bit_jaccard_ops
+CREATE OPERATOR <=> (
-	FOR TYPE bit USING hnsw AS
+	LEFTARG = intvec, RIGHTARG = intvec, PROCEDURE = cosine_distance,
-	OPERATOR 1 <%> (bit, bit) FOR ORDER BY float_ops,
+	COMMUTATOR = '<=>'
-	FUNCTION 1 jaccard_distance(bit, bit);
+);
+
+-- intvec opclasses
+
+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);
+
+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);
+
+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);

src/bitvector.c

@@ -1,90 +0,0 @@
-#include "postgres.h"
-
-#include "bitvector.h"
-#include "port/pg_bitutils.h"
-#include "utils/varbit.h"
-
-#if PG_VERSION_NUM >= 160000
-#include "varatt.h"
-#endif
-
-/*
- * Allocate and initialize a new bit vector
- */
-VarBit *
-InitBitVector(int dim)
-{
-	VarBit	   *result;
-	int			size;
-
-	size = VARBITTOTALLEN(dim);
-	result = (VarBit *) palloc0(size);
-	SET_VARSIZE(result, size);
-	VARBITLEN(result) = dim;
-
-	return result;
-}
-
-/*
- * Ensure same dimensions
- */
-static inline void
-CheckDims(VarBit *a, VarBit *b)
-{
-	if (VARBITLEN(a) != VARBITLEN(b))
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("different bit lengths %u and %u", VARBITLEN(a), VARBITLEN(b))));
-}
-
-/*
- * Get the Hamming distance between two bit vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(hamming_distance);
-Datum
-hamming_distance(PG_FUNCTION_ARGS)
-{
-	VarBit	   *a = PG_GETARG_VARBIT_P(0);
-	VarBit	   *b = PG_GETARG_VARBIT_P(1);
-	unsigned char *ax = VARBITS(a);
-	unsigned char *bx = VARBITS(b);
-	uint64		distance = 0;
-
-	CheckDims(a, b);
-
-	/* TODO Improve performance */
-	for (uint32 i = 0; i < VARBITBYTES(a); i++)
-		distance += pg_number_of_ones[ax[i] ^ bx[i]];
-
-	PG_RETURN_FLOAT8((double) distance);
-}
-
-/*
- * Get the Jaccard distance between two bit vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(jaccard_distance);
-Datum
-jaccard_distance(PG_FUNCTION_ARGS)
-{
-	VarBit	   *a = PG_GETARG_VARBIT_P(0);
-	VarBit	   *b = PG_GETARG_VARBIT_P(1);
-	unsigned char *ax = VARBITS(a);
-	unsigned char *bx = VARBITS(b);
-	uint64		ab = 0;
-	uint64		aa;
-	uint64		bb;
-
-	CheckDims(a, b);
-
-	/* TODO Improve performance */
-	for (uint32 i = 0; i < VARBITBYTES(a); i++)
-		ab += pg_number_of_ones[ax[i] & bx[i]];
-
-	if (ab == 0)
-		PG_RETURN_FLOAT8(1);
-
-	aa = pg_popcount((char *) ax, VARBITBYTES(a));
-	bb = pg_popcount((char *) bx, VARBITBYTES(b));
-
-	PG_RETURN_FLOAT8(1 - (ab / ((double) (aa + bb - ab))));
-}

src/bitvector.h

@@ -1,8 +0,0 @@
-#ifndef BITVECTOR_H
-#define BITVECTOR_H
-
-#include "utils/varbit.h"
-
-VarBit	   *InitBitVector(int dim);
-
-#endif

src/hnsw.h

@@ -58,7 +58,7 @@
 typedef enum HnswType
 {
 	HNSW_TYPE_VECTOR,
-	HNSW_TYPE_BIT
+	HNSW_TYPE_INTVEC
 }			HnswType;
 
 /* Build phases */

src/hnswbuild.c

@@ -44,7 +44,6 @@
 #include "access/xact.h"
 #include "access/xloginsert.h"
 #include "catalog/index.h"
-#include "catalog/pg_type_d.h"
 #include "commands/progress.h"
 #include "hnsw.h"
 #include "miscadmin.h"
@@ -666,27 +665,13 @@ HnswSharedMemoryAlloc(Size size, void *state)
 	return chunk;
 }
 
-/*
- * Get max dimensions
- */
-static int
-GetMaxDimensions(HnswType type)
-{
-	int			maxDimensions = HNSW_MAX_DIM;
-
-	if (type == HNSW_TYPE_BIT)
-		maxDimensions *= 32;
-
-	return maxDimensions;
-}
-
 /*
  * Initialize the build state
  */
 static void
 InitBuildState(HnswBuildState * buildstate, Relation heap, Relation index, IndexInfo *indexInfo, ForkNumber forkNum)
 {
-	int			maxDimensions;
+	int			maxDimensions = HNSW_MAX_DIM;
 
 	buildstate->heap = heap;
 	buildstate->index = index;
@@ -698,7 +683,8 @@ InitBuildState(HnswBuildState * buildstate, Relation heap, Relation index, Index
 	buildstate->efConstruction = HnswGetEfConstruction(index);
 	buildstate->dimensions = TupleDescAttr(index->rd_att, 0)->atttypmod;
 
-	maxDimensions = GetMaxDimensions(buildstate->type);
+	if (buildstate->type == HNSW_TYPE_INTVEC)
+		maxDimensions *= 4;
 
 	/* Require column to have dimensions to be indexed */
 	if (buildstate->dimensions < 0)

src/hnswscan.c

@@ -1,8 +1,6 @@
 #include "postgres.h"
 
 #include "access/relscan.h"
-#include "bitvector.h"
-#include "catalog/pg_type_d.h"
 #include "hnsw.h"
 #include "pgstat.h"
 #include "storage/bufmgr.h"

src/hnswutils.c

@@ -1,15 +1,17 @@
 #include "postgres.h"
 
+#include <float.h>
 #include <math.h>
 
 #include "access/generic_xlog.h"
-#include "catalog/pg_type_d.h"
+#include "catalog/pg_type.h"
 #include "hnsw.h"
 #include "lib/pairingheap.h"
 #include "storage/bufmgr.h"
 #include "utils/datum.h"
 #include "utils/memdebug.h"
 #include "utils/rel.h"
+#include "utils/syscache.h"
 #include "vector.h"
 
 #if PG_VERSION_NUM >= 130000
@@ -151,17 +153,29 @@ HnswOptionalProcInfo(Relation index, uint16 procnum)
 }
 
 /*
- * Get type
+ * Get vector type
  */
 HnswType
 HnswGetType(Relation index)
 {
-	Oid			typid = TupleDescAttr(index->rd_att, 0)->atttypid;
+	Oid			typeOid = TupleDescAttr(index->rd_att, 0)->atttypid;
+	HeapTuple	tuple;
+	Form_pg_type type;
+	int			result;
 
-	if (typid == BITOID || typid == VARBITOID)
+	tuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(typeOid));
-		return HNSW_TYPE_BIT;
+	if (!HeapTupleIsValid(tuple))
+		elog(ERROR, "cache lookup failed for type %u", typeOid);
 
-	return HNSW_TYPE_VECTOR;
+	type = (Form_pg_type) GETSTRUCT(tuple);
+	if (strcmp(NameStr(type->typname), "intvec") == 0)
+		result = HNSW_TYPE_INTVEC;
+	else
+		result = HNSW_TYPE_VECTOR;
+
+	ReleaseSysCache(tuple);
+
+	return result;
 }
 
 /*
@@ -190,6 +204,10 @@ HnswNormValue(FmgrInfo *procinfo, Oid collation, Datum *value, HnswType type)
 
 			*value = PointerGetDatum(result);
 		}
+		else if (type == HNSW_TYPE_INTVEC)
+		{
+			/* Do nothing */
+		}
 		else
 			elog(ERROR, "Unsupported type");
 
@@ -598,7 +616,14 @@ HnswLoadElement(HnswElement element, float *distance, Datum *q, Relation index,
 		if (DatumGetPointer(*q) == NULL)
 			*distance = 0;
 		else
+		{
 			*distance = (float) DatumGetFloat8(FunctionCall2Coll(procinfo, collation, *q, PointerGetDatum(&etup->data)));
+
+			/* Needed for intvec cosine distance */
+			/* TODO Improve */
+			if (isnan(*distance))
+				*distance = FLT_MAX;
+		}
 	}
 
 	UnlockReleaseBuffer(buf);

src/intvec.c

@@ -0,0 +1,608 @@
+#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;
+	char	   *stringEnd;
+	IntVector  *result;
+	char	   *litcopy = pstrdup(lit);
+	char	   *str = litcopy;
+
+	while (intvec_isspace(*str))
+		str++;
+
+	if (*str != '[')
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+				 errmsg("malformed intvec literal: \"%s\"", lit),
+				 errdetail("Vector contents must start with \"[\".")));
+
+	str++;
+	pt = strtok(str, ",");
+	stringEnd = pt;
+
+	while (pt != NULL && *stringEnd != ']')
+	{
+		long		l;
+
+		if (dim == INTVEC_MAX_DIM)
+			ereport(ERROR,
+					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+					 errmsg("intvec cannot have more than %d dimensions", INTVEC_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)));
+
+		/* Use similar logic as int2vectorin */
+		errno = 0;
+		l = strtol(pt, &stringEnd, 10);
+
+		if (stringEnd == pt)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+					 errmsg("invalid input syntax for type intvec: \"%s\"", lit)));
+
+		if (errno == ERANGE || l < SCHAR_MIN || l > SCHAR_MAX)
+			ereport(ERROR,
+					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+					 errmsg("value \"%s\" is out of range for type intvec", pt)));
+
+		x[dim++] = l;
+
+		while (intvec_isspace(*stringEnd))
+			stringEnd++;
+
+		if (*stringEnd != '\0' && *stringEnd != ']')
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+					 errmsg("invalid input syntax for type intvec: \"%s\"", lit)));
+
+		pt = strtok(NULL, ",");
+	}
+
+	if (stringEnd == NULL || *stringEnd != ']')
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+				 errmsg("malformed intvec literal: \"%s\"", lit),
+				 errdetail("Unexpected end of input.")));
+
+	stringEnd++;
+
+	/* Only whitespace is allowed after the closing brace */
+	while (intvec_isspace(*stringEnd))
+		stringEnd++;
+
+	if (*stringEnd != '\0')
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+				 errmsg("malformed intvec literal: \"%s\"", lit),
+				 errdetail("Junk after closing right brace.")));
+
+	/* Ensure no consecutive delimiters since strtok skips */
+	for (pt = lit + 1; *pt != '\0'; pt++)
+	{
+		if (pt[-1] == ',' && *pt == ',')
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+					 errmsg("malformed intvec literal: \"%s\"", lit)));
+	}
+
+	if (dim < 1)
+		ereport(ERROR,
+				(errcode(ERRCODE_DATA_EXCEPTION),
+				 errmsg("intvec must have at least 1 dimension")));
+
+	pfree(litcopy);
+
+	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);
+	Vector	   *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 = InitVector(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);
+}
+
+/*
+ * 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);
+	int8	   *ax = a->x;
+	int8	   *bx = b->x;
+	int			distance = 0;
+
+	CheckDims(a, b);
+
+	/* Auto-vectorized */
+	for (int i = 0; i < a->dim; i++)
+	{
+		int			diff = ax[i] - bx[i];
+
+		distance += diff * diff;
+	}
+
+	PG_RETURN_FLOAT8(sqrt((double) distance));
+}
+
+/*
+ * 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);
+	int8	   *ax = a->x;
+	int8	   *bx = b->x;
+	int			distance = 0;
+
+	CheckDims(a, b);
+
+	/* Auto-vectorized */
+	for (int i = 0; i < a->dim; i++)
+	{
+		int			diff = ax[i] - bx[i];
+
+		distance += diff * diff;
+	}
+
+	PG_RETURN_FLOAT8((double) 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);
+	int8	   *ax = a->x;
+	int8	   *bx = b->x;
+	int			distance = 0;
+
+	CheckDims(a, b);
+
+	/* Auto-vectorized */
+	for (int i = 0; i < a->dim; i++)
+		distance += ax[i] * bx[i];
+
+	PG_RETURN_FLOAT8((double) distance);
+}
+
+/*
+ * 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);
+	int8	   *ax = a->x;
+	int8	   *bx = b->x;
+	int			distance = 0;
+
+	CheckDims(a, b);
+
+	/* Auto-vectorized */
+	for (int i = 0; i < a->dim; i++)
+		distance += ax[i] * bx[i];
+
+	PG_RETURN_FLOAT8((double) -distance);
+}
+
+/*
+ * 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);
+	int8	   *ax = a->x;
+	int8	   *bx = b->x;
+	int			distance = 0;
+	int			norma = 0;
+	int			normb = 0;
+	double		similarity;
+
+	CheckDims(a, b);
+
+	/* Auto-vectorized */
+	for (int i = 0; i < a->dim; i++)
+	{
+		int8		axi = ax[i];
+		int8		bxi = bx[i];
+
+		distance += axi * bxi;
+		norma += axi * axi;
+		normb += bxi * bxi;
+	}
+
+	/* Use sqrt(a * b) over sqrt(a) * sqrt(b) */
+	similarity = (double) distance / sqrt((double) norma * (double) normb);
+
+#ifdef _MSC_VER
+	/* /fp:fast may not propagate NaN */
+	if (isnan(similarity))
+		PG_RETURN_FLOAT8(NAN);
+#endif
+
+	/* Keep in range */
+	if (similarity > 1)
+		similarity = 1;
+	else if (similarity < -1)
+		similarity = -1;
+
+	PG_RETURN_FLOAT8(1 - similarity);
+}
+
+/*
+ * Get the L1 distance between two 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);
+	int8	   *ax = a->x;
+	int8	   *bx = b->x;
+	int			distance = 0;
+
+	CheckDims(a, b);
+
+	/* Auto-vectorized */
+	for (int i = 0; i < a->dim; i++)
+		distance += abs(ax[i] - bx[i]);
+
+	PG_RETURN_FLOAT8((double) distance);
+}
+
+/*
+ * 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 += ax[i] * ax[i];
+
+	PG_RETURN_FLOAT8(sqrt((double) norm));
+}

src/intvec.h

@@ -0,0 +1,23 @@
+#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/vector.c

@@ -2,7 +2,6 @@
 
 #include <math.h>
 
-#include "bitvector.h"
 #include "catalog/pg_type.h"
 #include "common/shortest_dec.h"
 #include "fmgr.h"
@@ -276,9 +275,6 @@ vector_in(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(result);
 }
 
-#define AppendChar(ptr, c) (*(ptr)++ = (c))
-#define AppendFloat(ptr, f) ((ptr) += float_to_shortest_decimal_bufn((f), (ptr)))
-
 /*
  * Convert internal representation to textual representation
  */
@@ -290,6 +286,7 @@ vector_out(PG_FUNCTION_ARGS)
 	int			dim = vector->dim;
 	char	   *buf;
 	char	   *ptr;
+	int			n;
 
 	/*
 	 * Need:
@@ -304,17 +301,21 @@ vector_out(PG_FUNCTION_ARGS)
 	buf = (char *) palloc(FLOAT_SHORTEST_DECIMAL_LEN * dim + 2);
 	ptr = buf;
 
-	AppendChar(ptr, '[');
+	*ptr = '[';
-
+	ptr++;
 	for (int i = 0; i < dim; i++)
 	{
 		if (i > 0)
-			AppendChar(ptr, ',');
+		{
+			*ptr = ',';
+			ptr++;
+		}
 
-		AppendFloat(ptr, vector->x[i]);
+		n = float_to_shortest_decimal_bufn(vector->x[i], ptr);
+		ptr += n;
 	}
-
+	*ptr = ']';
-	AppendChar(ptr, ']');
+	ptr++;
 	*ptr = '\0';
 
 	PG_FREE_IF_COPY(vector, 0);
@@ -859,80 +860,6 @@ vector_mul(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(result);
 }
 
-/*
- * Quantize a vector
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(quantize_binary);
-Datum
-quantize_binary(PG_FUNCTION_ARGS)
-{
-	Vector	   *a = PG_GETARG_VECTOR_P(0);
-	float	   *ax = a->x;
-	VarBit	   *result = InitBitVector(a->dim);
-	unsigned char *rx = VARBITS(result);
-
-	for (int i = 0; i < a->dim; i++)
-		rx[i / 8] |= (ax[i] > 0) << (7 - (i % 8));
-
-	PG_RETURN_VARBIT_P(result);
-}
-
-/*
- * Get a subvector
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(subvector);
-Datum
-subvector(PG_FUNCTION_ARGS)
-{
-	Vector	   *a = PG_GETARG_VECTOR_P(0);
-	int32		start = PG_GETARG_INT32(1);
-	int32		count = PG_GETARG_INT32(2);
-	int32		end = start + count;
-	float	   *ax = a->x;
-	Vector	   *result;
-	int			dim;
-
-	/* Indexing starts at 1, like substring */
-	if (start < 1)
-		start = 1;
-
-	if (end > a->dim)
-		end = a->dim + 1;
-
-	dim = end - start;
-	CheckDim(dim);
-	result = InitVector(dim);
-
-	for (int i = 0; i < dim; i++)
-		result->x[i] = ax[start - 1 + i];
-
-	PG_RETURN_POINTER(result);
-}
-
-/*
- * Concatenate vectors
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_concat);
-Datum
-vector_concat(PG_FUNCTION_ARGS)
-{
-	Vector	   *a = PG_GETARG_VECTOR_P(0);
-	Vector	   *b = PG_GETARG_VECTOR_P(1);
-	Vector	   *result;
-	int			dim = a->dim + b->dim;
-
-	CheckDim(dim);
-	result = InitVector(dim);
-
-	for (int i = 0; i < a->dim; i++)
-		result->x[i] = a->x[i];
-
-	for (int i = 0; i < b->dim; i++)
-		result->x[i + a->dim] = b->x[i];
-
-	PG_RETURN_POINTER(result);
-}
-
 /*
  * Internal helper to compare vectors
  */
@@ -970,6 +897,9 @@ vector_lt(PG_FUNCTION_ARGS)
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
 
+	/* TODO Remove in 0.7.0 */
+	CheckDims(a, b);
+
 	PG_RETURN_BOOL(vector_cmp_internal(a, b) < 0);
 }
 
@@ -983,6 +913,9 @@ vector_le(PG_FUNCTION_ARGS)
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
 
+	/* TODO Remove in 0.7.0 */
+	CheckDims(a, b);
+
 	PG_RETURN_BOOL(vector_cmp_internal(a, b) <= 0);
 }
 
@@ -996,6 +929,9 @@ vector_eq(PG_FUNCTION_ARGS)
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
 
+	/* TODO Remove in 0.7.0 */
+	CheckDims(a, b);
+
 	PG_RETURN_BOOL(vector_cmp_internal(a, b) == 0);
 }
 
@@ -1009,6 +945,9 @@ vector_ne(PG_FUNCTION_ARGS)
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
 
+	/* TODO Remove in 0.7.0 */
+	CheckDims(a, b);
+
 	PG_RETURN_BOOL(vector_cmp_internal(a, b) != 0);
 }
 
@@ -1022,6 +961,9 @@ vector_ge(PG_FUNCTION_ARGS)
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
 
+	/* TODO Remove in 0.7.0 */
+	CheckDims(a, b);
+
 	PG_RETURN_BOOL(vector_cmp_internal(a, b) >= 0);
 }
 
@@ -1035,6 +977,9 @@ vector_gt(PG_FUNCTION_ARGS)
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
 
+	/* TODO Remove in 0.7.0 */
+	CheckDims(a, b);
+
 	PG_RETURN_BOOL(vector_cmp_internal(a, b) > 0);
 }
 

test/expected/bit_functions.out

@@ -1,64 +0,0 @@
-SELECT hamming_distance(B'111', B'111');
- hamming_distance 
-------------------
-                0
-(1 row)
-
-SELECT hamming_distance(B'111', B'110');
- hamming_distance 
-------------------
-                1
-(1 row)
-
-SELECT hamming_distance(B'111', B'100');
- hamming_distance 
-------------------
-                2
-(1 row)
-
-SELECT hamming_distance(B'111', B'000');
- hamming_distance 
-------------------
-                3
-(1 row)
-
-SELECT hamming_distance(B'111', B'00');
-ERROR:  different bit lengths 3 and 2
-SELECT jaccard_distance(B'1111', B'1111');
- jaccard_distance 
-------------------
-                0
-(1 row)
-
-SELECT jaccard_distance(B'1111', B'1110');
- jaccard_distance 
-------------------
-             0.25
-(1 row)
-
-SELECT jaccard_distance(B'1111', B'1100');
- jaccard_distance 
-------------------
-              0.5
-(1 row)
-
-SELECT jaccard_distance(B'1111', B'1000');
- jaccard_distance 
-------------------
-             0.75
-(1 row)
-
-SELECT jaccard_distance(B'1111', B'0000');
- jaccard_distance 
-------------------
-                1
-(1 row)
-
-SELECT jaccard_distance(B'1100', B'1000');
- jaccard_distance 
-------------------
-              0.5
-(1 row)
-
-SELECT jaccard_distance(B'1111', B'000');
-ERROR:  different bit lengths 4 and 3

test/expected/copy.out

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

test/expected/functions.out

@@ -24,38 +24,6 @@ SELECT '[1e37]'::vector * '[1e37]';
 ERROR:  value out of range: overflow
 SELECT '[1e-37]'::vector * '[1e-37]';
 ERROR:  value out of range: underflow
-SELECT '[1,2,3]'::vector || '[4,5]'::vector;
-  ?column?   
--------------
- [1,2,3,4,5]
-(1 row)
-
-SELECT array_fill(0, ARRAY[16000])::vector || '[1]'::vector;
-ERROR:  vector cannot have more than 16000 dimensions
-SELECT '[1,2,3]'::vector < '[1,2,3]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::vector < '[1,2]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::vector <= '[1,2,3]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::vector <= '[1,2]';
- ?column? 
-----------
- f
-(1 row)
-
 SELECT '[1,2,3]'::vector = '[1,2,3]';
  ?column? 
 ----------
@@ -63,47 +31,7 @@ SELECT '[1,2,3]'::vector = '[1,2,3]';
 (1 row)
 
 SELECT '[1,2,3]'::vector = '[1,2]';
- ?column? 
+ERROR:  different vector dimensions 3 and 2
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::vector != '[1,2,3]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::vector != '[1,2]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::vector >= '[1,2,3]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::vector >= '[1,2]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::vector > '[1,2,3]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::vector > '[1,2]';
- ?column? 
-----------
- t
-(1 row)
-
 SELECT vector_cmp('[1,2,3]', '[1,2,3]');
  vector_cmp 
 ------------
@@ -280,48 +208,6 @@ SELECT l1_distance('[3e38]'::vector, '[-3e38]');
     Infinity
 (1 row)
 
-SELECT quantize_binary('[1,0,-1]');
- quantize_binary 
------------------
- 100
-(1 row)
-
-SELECT quantize_binary('[0,0.1,-0.2,-0.3,0.4,0.5,0.6,-0.7,0.8,-0.9,1]');
- quantize_binary 
------------------
- 01001110101
-(1 row)
-
-SELECT subvector('[1,2,3,4,5]', 1, 3);
- subvector 
------------
- [1,2,3]
-(1 row)
-
-SELECT subvector('[1,2,3,4,5]', 3, 2);
- subvector 
------------
- [3,4]
-(1 row)
-
-SELECT subvector('[1,2,3,4,5]', -1, 3);
- subvector 
------------
- [1]
-(1 row)
-
-SELECT subvector('[1,2,3,4,5]', 3, 9);
- subvector 
------------
- [3,4,5]
-(1 row)
-
-SELECT subvector('[1,2,3,4,5]', 1, 0);
-ERROR:  vector must have at least 1 dimension
-SELECT subvector('[1,2,3,4,5]', 3, -1);
-ERROR:  vector must have at least 1 dimension
-SELECT subvector('[1,2,3,4,5]', -1, 2);
-ERROR:  vector must have at least 1 dimension
 SELECT avg(v) FROM unnest(ARRAY['[1,2,3]'::vector, '[3,5,7]']) v;
     avg    
 -----------

test/expected/hnsw_hamming.out

@@ -1,21 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val bit(3));
-INSERT INTO t (val) VALUES (B'000'), (B'100'), (B'111'), (NULL);
-CREATE INDEX ON t USING hnsw (val bit_hamming_ops);
-INSERT INTO t (val) VALUES (B'110');
-SELECT * FROM t ORDER BY val <~> B'111';
- val 
------
- 111
- 110
- 100
- 000
-(4 rows)
-
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <~> (SELECT NULL::bit)) t2;
- count 
--------
-     4
-(1 row)
-
-DROP TABLE t;

test/expected/hnsw_intvec_cosine.out

@@ -0,0 +1,26 @@
+SET enable_seqscan = off;
+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;

test/expected/hnsw_intvec_ip.out

@@ -0,0 +1,21 @@
+SET enable_seqscan = off;
+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;

test/expected/hnsw_intvec_l2.out

@@ -0,0 +1,33 @@
+SET enable_seqscan = off;
+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;

test/expected/hnsw_jaccard.out

@@ -1,21 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val bit(4));
-INSERT INTO t (val) VALUES (B'0000'), (B'1100'), (B'1111'), (NULL);
-CREATE INDEX ON t USING hnsw (val bit_jaccard_ops);
-INSERT INTO t (val) VALUES (B'1110');
-SELECT * FROM t ORDER BY val <%> B'1111';
- val  
-------
- 1111
- 1110
- 1100
- 0000
-(4 rows)
-
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <%> (SELECT NULL::bit)) t2;
- count 
--------
-     4
-(1 row)
-
-DROP TABLE t;

test/expected/input.out

@@ -66,22 +66,6 @@ SELECT '[4e38,1]'::vector;
 ERROR:  infinite value not allowed in vector
 LINE 1: SELECT '[4e38,1]'::vector;
                ^
-SELECT '[-4e38,1]'::vector;
-ERROR:  infinite value not allowed in vector
-LINE 1: SELECT '[-4e38,1]'::vector;
-               ^
-SELECT '[1e-46,1]'::vector;
- vector 
---------
- [0,1]
-(1 row)
-
-SELECT '[-1e-46,1]'::vector;
- vector 
---------
- [-0,1]
-(1 row)
-
 SELECT '[1,2,3'::vector;
 ERROR:  malformed vector literal: "[1,2,3"
 LINE 1: SELECT '[1,2,3'::vector;

test/expected/intvec_functions.out

@@ -0,0 +1,92 @@
+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/intvec_input.out

@@ -0,0 +1,119 @@
+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:  value "128" is out of range for type intvec
+LINE 1: SELECT '[128,-129]'::intvec;
+               ^
+SELECT '[1,2,3'::intvec;
+ERROR:  malformed intvec literal: "[1,2,3"
+LINE 1: SELECT '[1,2,3'::intvec;
+               ^
+DETAIL:  Unexpected end of input.
+SELECT '[1,2,3]9'::intvec;
+ERROR:  malformed intvec literal: "[1,2,3]9"
+LINE 1: SELECT '[1,2,3]9'::intvec;
+               ^
+DETAIL:  Junk after closing right brace.
+SELECT '1,2,3'::intvec;
+ERROR:  malformed intvec literal: "1,2,3"
+LINE 1: SELECT '1,2,3'::intvec;
+               ^
+DETAIL:  Vector contents must start with "[".
+SELECT ''::intvec;
+ERROR:  malformed intvec literal: ""
+LINE 1: SELECT ''::intvec;
+               ^
+DETAIL:  Vector contents must start with "[".
+SELECT '['::intvec;
+ERROR:  malformed intvec literal: "["
+LINE 1: SELECT '['::intvec;
+               ^
+DETAIL:  Unexpected end of input.
+SELECT '[,'::intvec;
+ERROR:  malformed intvec literal: "[,"
+LINE 1: SELECT '[,'::intvec;
+               ^
+DETAIL:  Unexpected end of input.
+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:  malformed intvec literal: "[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

test/sql/bit_functions.sql

@@ -1,13 +0,0 @@
-SELECT hamming_distance(B'111', B'111');
-SELECT hamming_distance(B'111', B'110');
-SELECT hamming_distance(B'111', B'100');
-SELECT hamming_distance(B'111', B'000');
-SELECT hamming_distance(B'111', B'00');
-
-SELECT jaccard_distance(B'1111', B'1111');
-SELECT jaccard_distance(B'1111', B'1110');
-SELECT jaccard_distance(B'1111', B'1100');
-SELECT jaccard_distance(B'1111', B'1000');
-SELECT jaccard_distance(B'1111', B'0000');
-SELECT jaccard_distance(B'1100', B'1000');
-SELECT jaccard_distance(B'1111', B'000');

test/sql/copy.sql

@@ -1,7 +1,7 @@
-CREATE TABLE t (val vector(3));
+CREATE TABLE t (val vector(3), val2 intvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
+INSERT INTO t (val, val2) VALUES ('[0,0,0]', '[0,0,0]'), ('[1,2,3]', '[1,2,3]'), ('[1,1,1]', '[1,1,1]'), (NULL, NULL);
 
-CREATE TABLE t2 (val vector(3));
+CREATE TABLE t2 (val vector(3), val2 intvec(3));
 
 \copy t TO 'results/data.bin' WITH (FORMAT binary)
 \copy t2 FROM 'results/data.bin' WITH (FORMAT binary)

test/sql/functions.sql

@@ -6,21 +6,8 @@ SELECT '[1,2,3]'::vector * '[4,5,6]';
 SELECT '[1e37]'::vector * '[1e37]';
 SELECT '[1e-37]'::vector * '[1e-37]';
 
-SELECT '[1,2,3]'::vector || '[4,5]'::vector;
-SELECT array_fill(0, ARRAY[16000])::vector || '[1]'::vector;
-
-SELECT '[1,2,3]'::vector < '[1,2,3]';
-SELECT '[1,2,3]'::vector < '[1,2]';
-SELECT '[1,2,3]'::vector <= '[1,2,3]';
-SELECT '[1,2,3]'::vector <= '[1,2]';
 SELECT '[1,2,3]'::vector = '[1,2,3]';
 SELECT '[1,2,3]'::vector = '[1,2]';
-SELECT '[1,2,3]'::vector != '[1,2,3]';
-SELECT '[1,2,3]'::vector != '[1,2]';
-SELECT '[1,2,3]'::vector >= '[1,2,3]';
-SELECT '[1,2,3]'::vector >= '[1,2]';
-SELECT '[1,2,3]'::vector > '[1,2,3]';
-SELECT '[1,2,3]'::vector > '[1,2]';
 
 SELECT vector_cmp('[1,2,3]', '[1,2,3]');
 SELECT vector_cmp('[1,2,3]', '[0,0,0]');
@@ -61,17 +48,6 @@ SELECT l1_distance('[0,0]'::vector, '[0,1]');
 SELECT l1_distance('[1,2]'::vector, '[3]');
 SELECT l1_distance('[3e38]'::vector, '[-3e38]');
 
-SELECT quantize_binary('[1,0,-1]');
-SELECT quantize_binary('[0,0.1,-0.2,-0.3,0.4,0.5,0.6,-0.7,0.8,-0.9,1]');
-
-SELECT subvector('[1,2,3,4,5]', 1, 3);
-SELECT subvector('[1,2,3,4,5]', 3, 2);
-SELECT subvector('[1,2,3,4,5]', -1, 3);
-SELECT subvector('[1,2,3,4,5]', 3, 9);
-SELECT subvector('[1,2,3,4,5]', 1, 0);
-SELECT subvector('[1,2,3,4,5]', 3, -1);
-SELECT subvector('[1,2,3,4,5]', -1, 2);
-
 SELECT avg(v) FROM unnest(ARRAY['[1,2,3]'::vector, '[3,5,7]']) v;
 SELECT avg(v) FROM unnest(ARRAY['[1,2,3]'::vector, '[3,5,7]', NULL]) v;
 SELECT avg(v) FROM unnest(ARRAY[]::vector[]) v;

test/sql/hnsw_hamming.sql

@@ -1,12 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val bit(3));
-INSERT INTO t (val) VALUES (B'000'), (B'100'), (B'111'), (NULL);
-CREATE INDEX ON t USING hnsw (val bit_hamming_ops);
-
-INSERT INTO t (val) VALUES (B'110');
-
-SELECT * FROM t ORDER BY val <~> B'111';
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <~> (SELECT NULL::bit)) t2;
-
-DROP TABLE t;

test/sql/hnsw_intvec_cosine.sql

@@ -0,0 +1,13 @@
+SET enable_seqscan = off;
+
+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;

test/sql/hnsw_intvec_ip.sql

@@ -0,0 +1,12 @@
+SET enable_seqscan = off;
+
+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;

test/sql/hnsw_intvec_l2.sql

@@ -0,0 +1,16 @@
+SET enable_seqscan = off;
+
+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;

test/sql/hnsw_jaccard.sql

@@ -1,12 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val bit(4));
-INSERT INTO t (val) VALUES (B'0000'), (B'1100'), (B'1111'), (NULL);
-CREATE INDEX ON t USING hnsw (val bit_jaccard_ops);
-
-INSERT INTO t (val) VALUES (B'1110');
-
-SELECT * FROM t ORDER BY val <%> B'1111';
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <%> (SELECT NULL::bit)) t2;
-
-DROP TABLE t;

test/sql/input.sql

@@ -11,9 +11,6 @@ SELECT '[1.5e38,-1.5e38]'::vector;
 SELECT '[1.5e+38,-1.5e+38]'::vector;
 SELECT '[1.5e-38,-1.5e-38]'::vector;
 SELECT '[4e38,1]'::vector;
-SELECT '[-4e38,1]'::vector;
-SELECT '[1e-46,1]'::vector;
-SELECT '[-1e-46,1]'::vector;
 SELECT '[1,2,3'::vector;
 SELECT '[1,2,3]9'::vector;
 SELECT '1,2,3'::vector;

test/sql/intvec_functions.sql

@@ -0,0 +1,21 @@
+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/intvec_input.sql

@@ -0,0 +1,28 @@
+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)[];

test/t/020_hnsw_intvec_build_recall.pl

@@ -8,8 +8,8 @@ my $node;
 my @queries = ();
 my @expected;
 my $limit = 20;
-my $dim = 52;
+my $dim = 20;
-my $max = 2**$dim;
+my $array_sql = join(",", ('(random() * 255)::int - 128') x $dim);
 
 sub test_recall
 {
@@ -19,8 +19,7 @@ sub test_recall
 
 	my $explain = $node->safe_psql("postgres", qq(
 		SET enable_seqscan = off;
-		SET hnsw.ef_search = 100;
+		EXPLAIN ANALYZE SELECT i FROM tst ORDER BY v $operator '$queries[0]' LIMIT $limit;
-		EXPLAIN ANALYZE SELECT i FROM tst ORDER BY v $operator $queries[0] LIMIT $limit;
 	));
 	like($explain, qr/Index Scan/);
 
@@ -28,23 +27,21 @@ sub test_recall
 	{
 		my $actual = $node->safe_psql("postgres", qq(
 			SET enable_seqscan = off;
-			SET hnsw.ef_search = 100;
+			SELECT i FROM tst ORDER BY v $operator '$queries[$i]' LIMIT $limit;
-			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]);
-		my %expected_set = map { $_ => 1 } @expected_ids;
 
-		foreach (@actual_ids)
+		foreach (@expected_ids)
 		{
-			if (exists($expected_set{$_}))
+			if (exists($actual_set{$_}))
 			{
 				$correct++;
 			}
+			$total++;
 		}
-
-		$total += $limit;
 	}
 
 	cmp_ok($correct / $total, ">=", $min, $operator);
@@ -57,21 +54,25 @@ $node->start;
 
 # Create table
 $node->safe_psql("postgres", "CREATE EXTENSION vector;");
-$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v bit($dim));");
+$node->safe_psql("postgres", "CREATE TABLE tst (i int4, v intvec($dim));");
 $node->safe_psql("postgres",
-	"INSERT INTO tst SELECT i, (random() * $max)::bigint::bit($dim) FROM generate_series(1, 10000) i;"
+	"INSERT INTO tst SELECT i, ARRAY[$array_sql] FROM generate_series(1, 10000) i;"
 );
 
 # Generate queries
 for (1 .. 20)
 {
-	my $r = int(rand() * $max);
+	my @r = ();
-	push(@queries, "${r}::bigint::bit($dim)");
+	for (1 .. $dim)
+	{
+		push(@r, int(rand(256)) - 128);
+	}
+	push(@queries, "[" . join(",", @r) . "]");
 }
 
 # Check each index type
-my @operators = ("<~>", "<\%>");
+my @operators = ("<->", "<#>", "<=>");
-my @opclasses = ("bit_hamming_ops", "bit_jaccard_ops");
+my @opclasses = ("intvec_l2_ops", "intvec_ip_ops", "intvec_cosine_ops");
 
 for my $i (0 .. $#operators)
 {
@@ -82,13 +83,7 @@ for my $i (0 .. $#operators)
 	@expected = ();
 	foreach (@queries)
 	{
-		# Handle ties
+		my $res = $node->safe_psql("postgres", "SELECT i FROM tst ORDER BY v $operator '$_' LIMIT $limit;");
-		my $res = $node->safe_psql("postgres", qq(
-			WITH top AS (
-				SELECT v $operator $_ AS distance FROM tst ORDER BY v $operator $_ LIMIT $limit
-			)
-			SELECT i FROM tst WHERE (v $operator $_) <= (SELECT MAX(distance) FROM top)
-		));
 		push(@expected, $res);
 	}
 
@@ -99,7 +94,7 @@ for my $i (0 .. $#operators)
 	));
 
 	# Test approximate results
-	my $min = $operator eq "<\%>" ? 0.96 : 0.98;
+	my $min = 0.99;
 	test_recall($min, $operator);
 
 	$node->safe_psql("postgres", "DROP INDEX idx;");