Added concatenate operator for vectors [skip ci]

.github/workflows/build.yml

@@ -1,6 +1,120 @@
 name: build
 on: [push, pull_request]
 jobs:
+  ubuntu:
+    runs-on: ${{ matrix.os }}
+    if: ${{ !startsWith(github.ref_name, 'mac') && !startsWith(github.ref_name, 'windows') }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - postgres: 17
+            os: ubuntu-22.04
+          - postgres: 16
+            os: ubuntu-22.04
+          - postgres: 15
+            os: ubuntu-22.04
+          - postgres: 14
+            os: ubuntu-22.04
+          - postgres: 13
+            os: ubuntu-20.04
+          - postgres: 12
+            os: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ankane/setup-postgres@v1
+        with:
+          postgres-version: ${{ matrix.postgres }}
+          dev-files: true
+      - run: make
+        env:
+          PG_CFLAGS: -DUSE_ASSERT_CHECKING -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare
+      - run: |
+          export PG_CONFIG=`which pg_config`
+          sudo --preserve-env=PG_CONFIG make install
+      - run: make installcheck
+      - if: ${{ failure() }}
+        run: cat regression.diffs
+      - run: |
+          sudo apt-get update
+          sudo apt-get install libipc-run-perl
+      - run: make prove_installcheck
+  mac:
+    runs-on: ${{ matrix.os }}
+    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 }}
+      - run: make
+        env:
+          PG_CFLAGS: -DUSE_ASSERT_CHECKING -Wall -Wextra -Werror -Wno-unused-parameter
+      - run: make install
+      - 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
+          tar xf $TAG.tar.gz
+          mv postgres-$TAG postgres
+        env:
+          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:
+    runs-on: windows-latest
+    if: ${{ !startsWith(github.ref_name, 'mac') }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ankane/setup-postgres@v1
+        with:
+          postgres-version: 14
+      - run: |
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" && ^
+          cd %TEMP% && ^
+          nmake /NOLOGO /F Makefile.win && ^
+          nmake /NOLOGO /F Makefile.win install && ^
+          nmake /NOLOGO /F Makefile.win installcheck && ^
+          nmake /NOLOGO /F Makefile.win clean && ^
+          nmake /NOLOGO /F Makefile.win uninstall
+        shell: cmd
+  i386:
+    if: ${{ !startsWith(github.ref_name, 'mac') && !startsWith(github.ref_name, 'windows') }}
+    runs-on: ubuntu-latest
+    container:
+      image: debian:12
+      options: --platform linux/386
+    steps:
+      - run: apt-get update && apt-get install -y build-essential git libipc-run-perl postgresql-15 postgresql-server-dev-15 sudo
+      - run: service postgresql start
+      - run: |
+          git clone https://github.com/${{ github.repository }}.git pgvector
+          cd pgvector
+          git fetch origin ${{ github.ref }}
+          git reset --hard FETCH_HEAD
+          make
+          make install
+          chown -R postgres .
+          sudo -u postgres make installcheck
+          sudo -u postgres make prove_installcheck
+        env:
+          PG_CFLAGS: -DUSE_ASSERT_CHECKING -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare
   valgrind:
     if: ${{ !startsWith(github.ref_name, 'mac') && !startsWith(github.ref_name, 'windows') }}
     runs-on: ubuntu-latest
@@ -9,7 +123,6 @@ jobs:
       - uses: ankane/setup-postgres-valgrind@v1
         with:
           postgres-version: 16
-          check-ub: yes
+      - run: make
-      - run: make OPTFLAGS=""
       - run: sudo --preserve-env=PG_CONFIG make install
-      - run: make prove_installcheck PROVE_TESTS=test/t/031_hnsw_sparsevec_vacuum_recall.pl
+      - run: make installcheck

CHANGELOG.md

@@ -1,16 +1,11 @@
 ## 0.7.0 (unreleased)
 
-- Added `halfvec` type
+- Added support for bit vectors to HNSW
-- Added `sparsevec` type
-- Added support for indexing `bit` type
-- Added support for indexing L1 distance with HNSW
-- Added `binary_quantize` function
 - Added `hamming_distance` function
 - Added `jaccard_distance` function
-- Added `l2_normalize` function
+- Added `quantize_binary` function
 - Added `subvector` function
 - Added concatenate operator for vectors
-- Added CPU dispatching for distance functions on Linux x86-64
 - 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/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
+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
-HEADERS = src/halfvec.h src/sparsevec.h src/vector.h
+HEADERS = src/vector.h
 
 TESTS = $(wildcard test/sql/*.sql)
 REGRESS = $(patsubst test/sql/%.sql,%,$(TESTS))

Makefile.win

@@ -1,10 +1,10 @@
 EXTENSION = vector
 EXTVERSION = 0.6.2
 
-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
+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
-HEADERS = src\halfvec.h src\sparsevec.h src\vector.h
+HEADERS = src\vector.h
 
-REGRESS = bit_functions btree_halfvec btree_sparsevec btree_vector cast copy halfvec_functions halfvec_input hnsw_bit_hamming hnsw_bit_jaccard hnsw_halfvec_cosine hnsw_halfvec_ip hnsw_halfvec_l2 hnsw_options hnsw_sparsevec_cosine hnsw_sparsevec_ip hnsw_sparsevec_l2 hnsw_unlogged hnsw_vector_cosine hnsw_vector_ip hnsw_vector_l2 ivfflat_halfvec_cosine ivfflat_halfvec_ip ivfflat_halfvec_l2 ivfflat_options ivfflat_unlogged ivfflat_vector_cosine ivfflat_vector_ip ivfflat_vector_l2 sparsevec_functions sparsevec_input vector_functions vector_input
+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_OPTS = --inputdir=test --load-extension=$(EXTENSION)
 
 # For /arch flags

README.md

@@ -81,7 +81,7 @@ Get the nearest neighbors by L2 distance
 SELECT * FROM items ORDER BY embedding <-> '[3,1,2]' LIMIT 5;
 ```
 
-Also supports inner product (`<#>`), cosine distance (`<=>`), and L1 distance (`<+>`, unreleased)
+Also supports inner product (`<#>`) and cosine distance (`<=>`)
 
 Note: `<#>` returns the negative inner product since Postgres only supports `ASC` order index scans on operators
 
@@ -138,13 +138,6 @@ Get the nearest neighbors to a vector
 SELECT * FROM items ORDER BY embedding <-> '[3,1,2]' LIMIT 5;
 ```
 
-Supported distance functions are:
-
-- `<->` - L2 distance
-- `<#>` - (negative) inner product
-- `<=>` - cosine distance
-- `<+>` - L1 distance (unreleased)
-
 Get the nearest neighbors to a row
 
 ```sql
@@ -228,12 +221,6 @@ Cosine distance
 CREATE INDEX ON items USING hnsw (embedding vector_cosine_ops);
 ```
 
-L1 distance - unreleased
-
-```sql
-CREATE INDEX ON items USING hnsw (embedding vector_l1_ops);
-```
-
 Hamming distance - unreleased
 
 ```sql
@@ -246,12 +233,7 @@ Jaccard distance - unreleased
 CREATE INDEX ON items USING hnsw (embedding bit_jaccard_ops);
 ```
 
-Supported types are:
+Vectors with up to 2,000 dimensions can be indexed, or bit vectors with up to 64,000 dimensions.
-
-- `vector` - up to 2,000 dimensions
-- `halfvec` - up to 4,000 dimensions (unreleased)
-- `bit` - up to 64,000 dimensions (unreleased)
-- `sparsevec` - up to 1,000 non-zero elements (unreleased)
 
 ### Index Options
 
@@ -356,17 +338,7 @@ Cosine distance
 CREATE INDEX ON items USING ivfflat (embedding vector_cosine_ops) WITH (lists = 100);
 ```
 
-Hamming distance - unreleased
+Vectors with up to 2,000 dimensions can be indexed.
-
-```sql
-CREATE INDEX ON items USING ivfflat (embedding bit_hamming_ops) WITH (lists = 100);
-```
-
-Supported types are:
-
-- `vector` - up to 2,000 dimensions
-- `halfvec` - up to 4,000 dimensions (unreleased)
-- `bit` - up to 64,000 dimensions (unreleased)
 
 ### Query Options
 
@@ -440,103 +412,6 @@ Use [partitioning](https://www.postgresql.org/docs/current/ddl-partitioning.html
 CREATE TABLE items (embedding vector(3), category_id int) PARTITION BY LIST(category_id);
 ```
 
-## Half Vectors
-
-*Unreleased*
-
-Use the `halfvec` type to store half-precision vectors
-
-```sql
-CREATE TABLE items (id bigserial PRIMARY KEY, embedding halfvec(3));
-```
-
-## Half Indexing
-
-*Unreleased*
-
-Index vectors at half precision for smaller indexes and faster build times
-
-```sql
-CREATE INDEX ON items USING hnsw ((embedding::halfvec(3)) halfvec_l2_ops);
-```
-
-Get the nearest neighbors
-
-```sql
-SELECT * FROM items ORDER BY embedding::halfvec(3) <-> '[1,2,3]' LIMIT 5;
-```
-
-## Binary Vectors
-
-Use the `bit` type to store binary vectors ([example](https://github.com/pgvector/pgvector-python/blob/master/examples/hash_image_search.py))
-
-```sql
-CREATE TABLE items (id bigserial PRIMARY KEY, embedding bit(3));
-INSERT INTO items (embedding) VALUES ('000'), ('111');
-```
-
-Get the nearest neighbors by Hamming distance
-
-```sql
-SELECT * FROM items ORDER BY bit_count(embedding # '101') LIMIT 5;
-```
-
-Or (unreleased)
-
-```sql
-SELECT * FROM items ORDER BY embedding <~> '101' LIMIT 5;
-```
-
-Also supports Jaccard distance (`<%>`)
-
-## Binary Quantization
-
-*Unreleased*
-
-Use expression indexing for binary quantization
-
-```sql
-CREATE INDEX ON items USING hnsw ((binary_quantize(embedding)::bit(3)) bit_hamming_ops);
-```
-
-Get the nearest neighbors by Hamming distance
-
-```sql
-SELECT * FROM items ORDER BY binary_quantize(embedding)::bit(3) <~> binary_quantize('[1,-2,3]') LIMIT 5;
-```
-
-Re-rank by the original vectors for better recall
-
-```sql
-SELECT * FROM (
-    SELECT * FROM items ORDER BY binary_quantize(embedding)::bit(3) <~> binary_quantize('[1,-2,3]') LIMIT 20
-) ORDER BY embedding <=> '[1,-2,3]' LIMIT 5;
-```
-
-## Sparse Vectors
-
-*Unreleased*
-
-Use the `sparsevec` type to store sparse vectors
-
-```sql
-CREATE TABLE items (id bigserial PRIMARY KEY, embedding sparsevec(5));
-```
-
-Insert vectors
-
-```sql
-INSERT INTO items (embedding) VALUES ('{1:1,3:2,5:3}/5'), ('{1:4,3:5,5:6}/5');
-```
-
-The format is `{index1:value1,index2:value2}/dimensions` and indices start at 1 like SQL arrays
-
-Get the nearest neighbors by L2 distance
-
-```sql
-SELECT * FROM items ORDER BY embedding <-> '{1:3,3:1,5:2}/5' LIMIT 5;
-```
-
 ## Hybrid Search
 
 Use together with Postgres [full-text search](https://www.postgresql.org/docs/current/textsearch-intro.html) for hybrid search.
@@ -548,30 +423,6 @@ SELECT id, content FROM items, plainto_tsquery('hello search') query
 
 You can use [Reciprocal Rank Fusion](https://github.com/pgvector/pgvector-python/blob/master/examples/hybrid_search_rrf.py) or a [cross-encoder](https://github.com/pgvector/pgvector-python/blob/master/examples/hybrid_search.py) to combine results.
 
-## Indexing Subvectors
-
-*Unreleased*
-
-Use expression indexing to index subvectors
-
-```sql
-CREATE INDEX ON items USING hnsw ((subvector(embedding, 1, 3)::vector(3)) vector_cosine_ops);
-```
-
-Get the nearest neighbors by cosine distance
-
-```sql
-SELECT * FROM items ORDER BY subvector(embedding, 1, 3)::vector(3) <=> subvector('[1,2,3,4,5]'::vector, 1, 3) LIMIT 5;
-```
-
-Re-rank by the full vectors for better recall
-
-```sql
-SELECT * FROM (
-    SELECT * FROM items ORDER BY subvector(embedding, 1, 3)::vector(3) <=> subvector('[1,2,3,4,5]'::vector, 1, 3) LIMIT 20
-) ORDER BY embedding <=> '[1,2,3,4,5]' LIMIT 5;
-```
-
 ## Performance
 
 ### Tuning
@@ -777,6 +628,18 @@ and query with:
 SELECT * FROM items ORDER BY embedding::vector(3) <-> '[3,1,2]' LIMIT 5;
 ```
 
+#### Are binary vectors supported?
+
+You can store binary vectors and perform exact nearest neighbor search by Hamming distance in Postgres without an extension ([example](https://github.com/pgvector/pgvector-python/blob/master/examples/hash_image_search.py)).
+
+```tsql
+CREATE TABLE items (id bigserial PRIMARY KEY, embedding bit(3));
+INSERT INTO items (embedding) VALUES (B'000'), (B'111');
+SELECT * FROM items ORDER BY bit_count(embedding # B'101') LIMIT 5;
+```
+
+Indexing is not currently supported.
+
 #### Do indexes need to fit into memory?
 
 No, but like other index types, you’ll likely see better performance if they do. You can get the size of an index with:
@@ -849,9 +712,7 @@ Also, note that `NULL` vectors are not indexed (as well as zero vectors for cosi
 ## Reference
 
 - [Vector](#vector-type)
-- [Halfvec](#halfvec-type)
 - [Bit](#bit-type)
-- [Sparsevec](#sparsevec-type)
 
 ### Vector Type
 
@@ -868,18 +729,16 @@ Operator | Description | Added
 <-> | Euclidean distance |
 <#> | negative inner product |
 <=> | cosine distance |
-<+> | taxicab distance | unreleased
 
 ### Vector Functions
 
 Function | Description | Added
 --- | --- | ---
-binary_quantize(vector) → bit | binary quantize | unreleased
 cosine_distance(vector, vector) → double precision | cosine distance |
 inner_product(vector, vector) → double precision | inner product |
-l1_distance(vector, vector) → double precision | taxicab distance | 0.5.0
 l2_distance(vector, vector) → double precision | Euclidean distance |
-l2_normalize(vector) → vector | Normalize with Euclidean norm | unreleased
+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 |
@@ -891,47 +750,9 @@ Function | Description | Added
 avg(vector) → vector | average |
 sum(vector) → vector | sum | 0.5.0
 
-### Halfvec Type
-
-Each half vector takes `2 * dimensions + 8` bytes of storage. Each element is a half-precision floating-point number, and all elements must be finite (no `NaN`, `Infinity` or `-Infinity`). Half vectors can have up to 16,000 dimensions.
-
-### Halfvec Operators
-
-Operator | Description | Added
---- | --- | ---
-\+ | element-wise addition | unreleased
-\- | element-wise subtraction | unreleased
-\* | element-wise multiplication | unreleased
-\|\| | concatenate | unreleased
-<-> | Euclidean distance | unreleased
-<#> | negative inner product | unreleased
-<=> | cosine distance | unreleased
-<+> | taxicab distance | unreleased
-
-### Halfvec Functions
-
-Function | Description | Added
---- | --- | ---
-binary_quantize(halfvec) → bit | binary quantize | unreleased
-cosine_distance(halfvec, halfvec) → double precision | cosine distance | unreleased
-inner_product(halfvec, halfvec) → double precision | inner product | unreleased
-l1_distance(halfvec, halfvec) → double precision | taxicab distance | unreleased
-l2_distance(halfvec, halfvec) → double precision | Euclidean distance | unreleased
-l2_norm(halfvec) → double precision | Euclidean norm | unreleased
-l2_normalize(halfvec) → halfvec | Normalize with Euclidean norm | unreleased
-subvector(halfvec, integer, integer) → halfvec | subvector | unreleased
-vector_dims(halfvec) → integer | number of dimensions | unreleased
-
-### Halfvec Aggregate Functions
-
-Function | Description | Added
---- | --- | ---
-avg(halfvec) → halfvec | average | unreleased
-sum(halfvec) → halfvec | sum | unreleased
-
 ### 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.
+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.
 
 ### Bit Operators
 
@@ -947,30 +768,6 @@ Function | Description | Added
 hamming_distance(bit, bit) → double precision | Hamming distance | unreleased
 jaccard_distance(bit, bit) → double precision | Jaccard distance | unreleased
 
-### Sparsevec Type
-
-Each sparse vector takes `8 * non-zero elements + 16` bytes of storage. Each element is a single-precision floating-point number, and all elements must be finite (no `NaN`, `Infinity` or `-Infinity`). Sparse vectors can have up to 16,000 non-zero elements.
-
-### Sparsevec Operators
-
-Operator | Description | Added
---- | --- | ---
-<-> | Euclidean distance | unreleased
-<#> | negative inner product | unreleased
-<=> | cosine distance | unreleased
-<+> | taxicab distance | unreleased
-
-### Sparsevec Functions
-
-Function | Description | Added
---- | --- | ---
-cosine_distance(sparsevec, sparsevec) → double precision | cosine distance | unreleased
-inner_product(sparsevec, sparsevec) → double precision | inner product | unreleased
-l1_distance(sparsevec, sparsevec) → double precision | taxicab distance | unreleased
-l2_distance(sparsevec, sparsevec) → double precision | Euclidean distance | unreleased
-l2_norm(sparsevec) → double precision | Euclidean norm | unreleased
-l2_normalize(sparsevec) → sparsevec | Normalize with Euclidean norm | unreleased
-
 ## Installation Notes - Linux and Mac
 
 ### Postgres Location
@@ -1096,7 +893,7 @@ Note: Replace `16` with your Postgres server version
 Install the FreeBSD package with:
 
 ```sh
-pkg install postgresql15-pgvector
+pkg install postgresql15-pg_vector
 ```
 
 or the port with:

sql/vector--0.6.2--0.7.0.sql

@@ -1,10 +1,7 @@
 -- 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 l2_normalize(vector) RETURNS vector
+CREATE FUNCTION quantize_binary(vector) RETURNS bit
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION binary_quantize(vector) RETURNS bit
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
 CREATE FUNCTION subvector(vector, int, int) RETURNS vector
@@ -13,32 +10,16 @@ CREATE FUNCTION subvector(vector, int, int) RETURNS vector
 CREATE FUNCTION vector_concat(vector, vector) RETURNS vector
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
-CREATE OPERATOR <+> (
-	LEFTARG = vector, RIGHTARG = vector, PROCEDURE = l1_distance,
-	COMMUTATOR = '<+>'
-);
-
 CREATE OPERATOR || (
 	LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_concat
 );
 
-CREATE OPERATOR CLASS vector_l1_ops
-	FOR TYPE vector USING hnsw AS
-	OPERATOR 1 <+> (vector, vector) FOR ORDER BY float_ops,
-	FUNCTION 1 l1_distance(vector, vector);
-
 CREATE FUNCTION hamming_distance(bit, bit) RETURNS float8
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
 CREATE FUNCTION jaccard_distance(bit, bit) RETURNS float8
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
-CREATE FUNCTION bit_ivfflat_support(internal) RETURNS internal
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION bit_hnsw_support(internal) RETURNS internal
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
 CREATE OPERATOR <~> (
 	LEFTARG = bit, RIGHTARG = bit, PROCEDURE = hamming_distance,
 	COMMUTATOR = '<~>'
@@ -49,522 +30,12 @@ CREATE OPERATOR <%> (
 	COMMUTATOR = '<%>'
 );
 
-CREATE OPERATOR CLASS bit_hamming_ops
-	FOR TYPE bit USING ivfflat AS
-	OPERATOR 1 <~> (bit, bit) FOR ORDER BY float_ops,
-	FUNCTION 1 hamming_distance(bit, bit),
-	FUNCTION 3 hamming_distance(bit, bit),
-	FUNCTION 6 bit_ivfflat_support(internal);
-
 CREATE OPERATOR CLASS bit_hamming_ops
 	FOR TYPE bit USING hnsw AS
 	OPERATOR 1 <~> (bit, bit) FOR ORDER BY float_ops,
-	FUNCTION 1 hamming_distance(bit, bit),
+	FUNCTION 1 hamming_distance(bit, bit);
-	FUNCTION 4 bit_hnsw_support(internal);
 
 CREATE OPERATOR CLASS bit_jaccard_ops
 	FOR TYPE bit USING hnsw AS
 	OPERATOR 1 <%> (bit, bit) FOR ORDER BY float_ops,
-	FUNCTION 1 jaccard_distance(bit, bit),
+	FUNCTION 1 jaccard_distance(bit, bit);
-	FUNCTION 4 bit_hnsw_support(internal);
-
-CREATE TYPE halfvec;
-
-CREATE FUNCTION halfvec_in(cstring, oid, integer) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_out(halfvec) RETURNS cstring
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_typmod_in(cstring[]) RETURNS integer
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_recv(internal, oid, integer) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_send(halfvec) RETURNS bytea
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE TYPE halfvec (
-	INPUT     = halfvec_in,
-	OUTPUT    = halfvec_out,
-	TYPMOD_IN = halfvec_typmod_in,
-	RECEIVE   = halfvec_recv,
-	SEND      = halfvec_send,
-	STORAGE   = external
-);
-
-CREATE FUNCTION l2_distance(halfvec, halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'halfvec_l2_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION inner_product(halfvec, halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'halfvec_inner_product' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION cosine_distance(halfvec, halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'halfvec_cosine_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l1_distance(halfvec, halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'halfvec_l1_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION vector_dims(halfvec) RETURNS integer
-	AS 'MODULE_PATHNAME', 'halfvec_vector_dims' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l2_norm(halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'halfvec_l2_norm' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l2_normalize(halfvec) RETURNS halfvec
-	AS 'MODULE_PATHNAME', 'halfvec_l2_normalize' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION binary_quantize(halfvec) RETURNS bit
-	AS 'MODULE_PATHNAME', 'halfvec_binary_quantize' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION subvector(halfvec, int, int) RETURNS halfvec
-	AS 'MODULE_PATHNAME', 'halfvec_subvector' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_add(halfvec, halfvec) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_sub(halfvec, halfvec) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_mul(halfvec, halfvec) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_concat(halfvec, halfvec) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_lt(halfvec, halfvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_le(halfvec, halfvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_eq(halfvec, halfvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_ne(halfvec, halfvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_ge(halfvec, halfvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_gt(halfvec, halfvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_cmp(halfvec, halfvec) RETURNS int4
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_l2_squared_distance(halfvec, halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_negative_inner_product(halfvec, halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_spherical_distance(halfvec, halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_accum(double precision[], halfvec) RETURNS double precision[]
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_avg(double precision[]) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_ivfflat_support(internal) RETURNS internal
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_hnsw_support(internal) RETURNS internal
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE AGGREGATE avg(halfvec) (
-	SFUNC = halfvec_accum,
-	STYPE = double precision[],
-	FINALFUNC = halfvec_avg,
-	COMBINEFUNC = vector_combine,
-	INITCOND = '{0}',
-	PARALLEL = SAFE
-);
-
-CREATE AGGREGATE sum(halfvec) (
-	SFUNC = halfvec_add,
-	STYPE = halfvec,
-	COMBINEFUNC = halfvec_add,
-	PARALLEL = SAFE
-);
-
-CREATE FUNCTION halfvec(halfvec, integer, boolean) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_to_vector(halfvec, integer, boolean) RETURNS vector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION vector_to_halfvec(vector, integer, boolean) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION array_to_halfvec(integer[], integer, boolean) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION array_to_halfvec(real[], integer, boolean) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION array_to_halfvec(double precision[], integer, boolean) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION array_to_halfvec(numeric[], integer, boolean) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_to_float4(halfvec, integer, boolean) RETURNS real[]
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE CAST (halfvec AS halfvec)
-	WITH FUNCTION halfvec(halfvec, integer, boolean) AS IMPLICIT;
-
-CREATE CAST (halfvec AS vector)
-	WITH FUNCTION halfvec_to_vector(halfvec, integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (vector AS halfvec)
-	WITH FUNCTION vector_to_halfvec(vector, integer, boolean) AS IMPLICIT;
-
-CREATE CAST (halfvec AS real[])
-	WITH FUNCTION halfvec_to_float4(halfvec, integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (integer[] AS halfvec)
-	WITH FUNCTION array_to_halfvec(integer[], integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (real[] AS halfvec)
-	WITH FUNCTION array_to_halfvec(real[], integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (double precision[] AS halfvec)
-	WITH FUNCTION array_to_halfvec(double precision[], integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (numeric[] AS halfvec)
-	WITH FUNCTION array_to_halfvec(numeric[], integer, boolean) AS ASSIGNMENT;
-
-CREATE OPERATOR <-> (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = l2_distance,
-	COMMUTATOR = '<->'
-);
-
-CREATE OPERATOR <#> (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_negative_inner_product,
-	COMMUTATOR = '<#>'
-);
-
-CREATE OPERATOR <=> (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = cosine_distance,
-	COMMUTATOR = '<=>'
-);
-
-CREATE OPERATOR <+> (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = l1_distance,
-	COMMUTATOR = '<+>'
-);
-
-CREATE OPERATOR + (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_add,
-	COMMUTATOR = +
-);
-
-CREATE OPERATOR - (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_sub
-);
-
-CREATE OPERATOR * (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_mul,
-	COMMUTATOR = *
-);
-
-CREATE OPERATOR || (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_concat
-);
-
-CREATE OPERATOR < (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_lt,
-	COMMUTATOR = > , NEGATOR = >= ,
-	RESTRICT = scalarltsel, JOIN = scalarltjoinsel
-);
-
-CREATE OPERATOR <= (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_le,
-	COMMUTATOR = >= , NEGATOR = > ,
-	RESTRICT = scalarlesel, JOIN = scalarlejoinsel
-);
-
-CREATE OPERATOR = (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_eq,
-	COMMUTATOR = = , NEGATOR = <> ,
-	RESTRICT = eqsel, JOIN = eqjoinsel
-);
-
-CREATE OPERATOR <> (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_ne,
-	COMMUTATOR = <> , NEGATOR = = ,
-	RESTRICT = eqsel, JOIN = eqjoinsel
-);
-
-CREATE OPERATOR >= (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_ge,
-	COMMUTATOR = <= , NEGATOR = < ,
-	RESTRICT = scalargesel, JOIN = scalargejoinsel
-);
-
-CREATE OPERATOR > (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_gt,
-	COMMUTATOR = < , NEGATOR = <= ,
-	RESTRICT = scalargtsel, JOIN = scalargtjoinsel
-);
-
-CREATE OPERATOR CLASS halfvec_ops
-	DEFAULT FOR TYPE halfvec USING btree AS
-	OPERATOR 1 < ,
-	OPERATOR 2 <= ,
-	OPERATOR 3 = ,
-	OPERATOR 4 >= ,
-	OPERATOR 5 > ,
-	FUNCTION 1 halfvec_cmp(halfvec, halfvec);
-
-CREATE OPERATOR CLASS halfvec_l2_ops
-	FOR TYPE halfvec USING ivfflat AS
-	OPERATOR 1 <-> (halfvec, halfvec) FOR ORDER BY float_ops,
-	FUNCTION 1 halfvec_l2_squared_distance(halfvec, halfvec),
-	FUNCTION 3 l2_distance(halfvec, halfvec),
-	FUNCTION 6 halfvec_ivfflat_support(internal);
-
-CREATE OPERATOR CLASS halfvec_ip_ops
-	FOR TYPE halfvec USING ivfflat AS
-	OPERATOR 1 <#> (halfvec, halfvec) FOR ORDER BY float_ops,
-	FUNCTION 1 halfvec_negative_inner_product(halfvec, halfvec),
-	FUNCTION 3 halfvec_spherical_distance(halfvec, halfvec),
-	FUNCTION 4 l2_norm(halfvec),
-	FUNCTION 5 l2_normalize(halfvec),
-	FUNCTION 6 halfvec_ivfflat_support(internal);
-
-CREATE OPERATOR CLASS halfvec_cosine_ops
-	FOR TYPE halfvec USING ivfflat AS
-	OPERATOR 1 <=> (halfvec, halfvec) FOR ORDER BY float_ops,
-	FUNCTION 1 halfvec_negative_inner_product(halfvec, halfvec),
-	FUNCTION 2 l2_norm(halfvec),
-	FUNCTION 3 halfvec_spherical_distance(halfvec, halfvec),
-	FUNCTION 4 l2_norm(halfvec),
-	FUNCTION 5 l2_normalize(halfvec),
-	FUNCTION 6 halfvec_ivfflat_support(internal);
-
-CREATE OPERATOR CLASS halfvec_l2_ops
-	FOR TYPE halfvec USING hnsw AS
-	OPERATOR 1 <-> (halfvec, halfvec) FOR ORDER BY float_ops,
-	FUNCTION 1 halfvec_l2_squared_distance(halfvec, halfvec),
-	FUNCTION 4 halfvec_hnsw_support(internal);
-
-CREATE OPERATOR CLASS halfvec_ip_ops
-	FOR TYPE halfvec USING hnsw AS
-	OPERATOR 1 <#> (halfvec, halfvec) FOR ORDER BY float_ops,
-	FUNCTION 1 halfvec_negative_inner_product(halfvec, halfvec),
-	FUNCTION 4 halfvec_hnsw_support(internal);
-
-CREATE OPERATOR CLASS halfvec_cosine_ops
-	FOR TYPE halfvec USING hnsw AS
-	OPERATOR 1 <=> (halfvec, halfvec) FOR ORDER BY float_ops,
-	FUNCTION 1 halfvec_negative_inner_product(halfvec, halfvec),
-	FUNCTION 2 l2_norm(halfvec),
-	FUNCTION 3 l2_normalize(halfvec),
-	FUNCTION 4 halfvec_hnsw_support(internal);
-
-CREATE OPERATOR CLASS halfvec_l1_ops
-	FOR TYPE halfvec USING hnsw AS
-	OPERATOR 1 <+> (halfvec, halfvec) FOR ORDER BY float_ops,
-	FUNCTION 1 l1_distance(halfvec, halfvec),
-	FUNCTION 4 halfvec_hnsw_support(internal);
-
-CREATE TYPE sparsevec;
-
-CREATE FUNCTION sparsevec_in(cstring, oid, integer) RETURNS sparsevec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_out(sparsevec) RETURNS cstring
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_typmod_in(cstring[]) RETURNS integer
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_recv(internal, oid, integer) RETURNS sparsevec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_send(sparsevec) RETURNS bytea
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE TYPE sparsevec (
-	INPUT     = sparsevec_in,
-	OUTPUT    = sparsevec_out,
-	TYPMOD_IN = sparsevec_typmod_in,
-	RECEIVE   = sparsevec_recv,
-	SEND      = sparsevec_send,
-	STORAGE   = external
-);
-
-CREATE FUNCTION l2_distance(sparsevec, sparsevec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'sparsevec_l2_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION inner_product(sparsevec, sparsevec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'sparsevec_inner_product' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION cosine_distance(sparsevec, sparsevec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'sparsevec_cosine_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l1_distance(sparsevec, sparsevec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'sparsevec_l1_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l2_norm(sparsevec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'sparsevec_l2_norm' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l2_normalize(sparsevec) RETURNS sparsevec
-	AS 'MODULE_PATHNAME', 'sparsevec_l2_normalize' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_lt(sparsevec, sparsevec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_le(sparsevec, sparsevec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_eq(sparsevec, sparsevec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_ne(sparsevec, sparsevec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_ge(sparsevec, sparsevec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_gt(sparsevec, sparsevec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_cmp(sparsevec, sparsevec) RETURNS int4
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_l2_squared_distance(sparsevec, sparsevec) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_negative_inner_product(sparsevec, sparsevec) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec(sparsevec, integer, boolean) RETURNS sparsevec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION vector_to_sparsevec(vector, integer, boolean) RETURNS sparsevec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_to_vector(sparsevec, integer, boolean) RETURNS vector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_to_sparsevec(halfvec, integer, boolean) RETURNS sparsevec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_to_halfvec(sparsevec, integer, boolean) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_hnsw_support(internal) RETURNS internal
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE CAST (sparsevec AS sparsevec)
-	WITH FUNCTION sparsevec(sparsevec, integer, boolean) AS IMPLICIT;
-
-CREATE CAST (sparsevec AS vector)
-	WITH FUNCTION sparsevec_to_vector(sparsevec, integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (vector AS sparsevec)
-	WITH FUNCTION vector_to_sparsevec(vector, integer, boolean) AS IMPLICIT;
-
-CREATE CAST (sparsevec AS halfvec)
-	WITH FUNCTION sparsevec_to_halfvec(sparsevec, integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (halfvec AS sparsevec)
-	WITH FUNCTION halfvec_to_sparsevec(halfvec, integer, boolean) AS IMPLICIT;
-
-CREATE OPERATOR <-> (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = l2_distance,
-	COMMUTATOR = '<->'
-);
-
-CREATE OPERATOR <#> (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = sparsevec_negative_inner_product,
-	COMMUTATOR = '<#>'
-);
-
-CREATE OPERATOR <=> (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = cosine_distance,
-	COMMUTATOR = '<=>'
-);
-
-CREATE OPERATOR <+> (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = l1_distance,
-	COMMUTATOR = '<+>'
-);
-
-CREATE OPERATOR < (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = sparsevec_lt,
-	COMMUTATOR = > , NEGATOR = >= ,
-	RESTRICT = scalarltsel, JOIN = scalarltjoinsel
-);
-
-CREATE OPERATOR <= (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = sparsevec_le,
-	COMMUTATOR = >= , NEGATOR = > ,
-	RESTRICT = scalarlesel, JOIN = scalarlejoinsel
-);
-
-CREATE OPERATOR = (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = sparsevec_eq,
-	COMMUTATOR = = , NEGATOR = <> ,
-	RESTRICT = eqsel, JOIN = eqjoinsel
-);
-
-CREATE OPERATOR <> (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = sparsevec_ne,
-	COMMUTATOR = <> , NEGATOR = = ,
-	RESTRICT = eqsel, JOIN = eqjoinsel
-);
-
-CREATE OPERATOR >= (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = sparsevec_ge,
-	COMMUTATOR = <= , NEGATOR = < ,
-	RESTRICT = scalargesel, JOIN = scalargejoinsel
-);
-
-CREATE OPERATOR > (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = sparsevec_gt,
-	COMMUTATOR = < , NEGATOR = <= ,
-	RESTRICT = scalargtsel, JOIN = scalargtjoinsel
-);
-
-CREATE OPERATOR CLASS sparsevec_ops
-	DEFAULT FOR TYPE sparsevec USING btree AS
-	OPERATOR 1 < ,
-	OPERATOR 2 <= ,
-	OPERATOR 3 = ,
-	OPERATOR 4 >= ,
-	OPERATOR 5 > ,
-	FUNCTION 1 sparsevec_cmp(sparsevec, sparsevec);
-
-CREATE OPERATOR CLASS sparsevec_l2_ops
-	FOR TYPE sparsevec USING hnsw AS
-	OPERATOR 1 <-> (sparsevec, sparsevec) FOR ORDER BY float_ops,
-	FUNCTION 1 sparsevec_l2_squared_distance(sparsevec, sparsevec),
-	FUNCTION 4 sparsevec_hnsw_support(internal);
-
-CREATE OPERATOR CLASS sparsevec_ip_ops
-	FOR TYPE sparsevec USING hnsw AS
-	OPERATOR 1 <#> (sparsevec, sparsevec) FOR ORDER BY float_ops,
-	FUNCTION 1 sparsevec_negative_inner_product(sparsevec, sparsevec),
-	FUNCTION 4 sparsevec_hnsw_support(internal);
-
-CREATE OPERATOR CLASS sparsevec_cosine_ops
-	FOR TYPE sparsevec USING hnsw AS
-	OPERATOR 1 <=> (sparsevec, sparsevec) FOR ORDER BY float_ops,
-	FUNCTION 1 sparsevec_negative_inner_product(sparsevec, sparsevec),
-	FUNCTION 2 l2_norm(sparsevec),
-	FUNCTION 3 l2_normalize(sparsevec),
-	FUNCTION 4 sparsevec_hnsw_support(internal);
-
-CREATE OPERATOR CLASS sparsevec_l1_ops
-	FOR TYPE sparsevec USING hnsw AS
-	OPERATOR 1 <+> (sparsevec, sparsevec) FOR ORDER BY float_ops,
-	FUNCTION 1 l1_distance(sparsevec, sparsevec),
-	FUNCTION 4 sparsevec_hnsw_support(internal);

sql/vector.sql

@@ -49,17 +49,6 @@ CREATE FUNCTION vector_dims(vector) RETURNS integer
 CREATE FUNCTION vector_norm(vector) RETURNS float8
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
-CREATE FUNCTION l2_normalize(vector) RETURNS vector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION binary_quantize(vector) RETURNS bit
-	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_add(vector, vector) RETURNS vector
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
@@ -69,9 +58,14 @@ 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 vector_concat(vector, vector) RETURNS vector
+CREATE FUNCTION quantize_binary(vector) RETURNS bit
 	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;
 
@@ -111,6 +105,9 @@ 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
+	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
 -- vector aggregates
 
 CREATE AGGREGATE avg(vector) (
@@ -186,11 +183,6 @@ CREATE OPERATOR <=> (
 	COMMUTATOR = '<=>'
 );
 
-CREATE OPERATOR <+> (
-	LEFTARG = vector, RIGHTARG = vector, PROCEDURE = l1_distance,
-	COMMUTATOR = '<+>'
-);
-
 CREATE OPERATOR + (
 	LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_add,
 	COMMUTATOR = +
@@ -309,11 +301,6 @@ CREATE OPERATOR CLASS vector_cosine_ops
 	FUNCTION 1 vector_negative_inner_product(vector, vector),
 	FUNCTION 2 vector_norm(vector);
 
-CREATE OPERATOR CLASS vector_l1_ops
-	FOR TYPE vector USING hnsw AS
-	OPERATOR 1 <+> (vector, vector) FOR ORDER BY float_ops,
-	FUNCTION 1 l1_distance(vector, vector);
-
 -- bit functions
 
 CREATE FUNCTION hamming_distance(bit, bit) RETURNS float8
@@ -322,16 +309,6 @@ CREATE FUNCTION hamming_distance(bit, bit) RETURNS float8
 CREATE FUNCTION jaccard_distance(bit, bit) RETURNS float8
 	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
--- bit private functions
-
-CREATE FUNCTION bit_ivfflat_support(internal) RETURNS internal
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION bit_hnsw_support(internal) RETURNS internal
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- bit operators
-
 CREATE OPERATOR <~> (
 	LEFTARG = bit, RIGHTARG = bit, PROCEDURE = hamming_distance,
 	COMMUTATOR = '<~>'
@@ -342,554 +319,12 @@ CREATE OPERATOR <%> (
 	COMMUTATOR = '<%>'
 );
 
--- bit opclasses
-
-CREATE OPERATOR CLASS bit_hamming_ops
-	FOR TYPE bit USING ivfflat AS
-	OPERATOR 1 <~> (bit, bit) FOR ORDER BY float_ops,
-	FUNCTION 1 hamming_distance(bit, bit),
-	FUNCTION 3 hamming_distance(bit, bit),
-	FUNCTION 6 bit_ivfflat_support(internal);
-
 CREATE OPERATOR CLASS bit_hamming_ops
 	FOR TYPE bit USING hnsw AS
 	OPERATOR 1 <~> (bit, bit) FOR ORDER BY float_ops,
-	FUNCTION 1 hamming_distance(bit, bit),
+	FUNCTION 1 hamming_distance(bit, bit);
-	FUNCTION 4 bit_hnsw_support(internal);
 
 CREATE OPERATOR CLASS bit_jaccard_ops
 	FOR TYPE bit USING hnsw AS
 	OPERATOR 1 <%> (bit, bit) FOR ORDER BY float_ops,
-	FUNCTION 1 jaccard_distance(bit, bit),
+	FUNCTION 1 jaccard_distance(bit, bit);
-	FUNCTION 4 bit_hnsw_support(internal);
-
--- halfvec type
-
-CREATE TYPE halfvec;
-
-CREATE FUNCTION halfvec_in(cstring, oid, integer) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_out(halfvec) RETURNS cstring
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_typmod_in(cstring[]) RETURNS integer
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_recv(internal, oid, integer) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_send(halfvec) RETURNS bytea
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE TYPE halfvec (
-	INPUT     = halfvec_in,
-	OUTPUT    = halfvec_out,
-	TYPMOD_IN = halfvec_typmod_in,
-	RECEIVE   = halfvec_recv,
-	SEND      = halfvec_send,
-	STORAGE   = external
-);
-
--- halfvec functions
-
-CREATE FUNCTION l2_distance(halfvec, halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'halfvec_l2_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION inner_product(halfvec, halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'halfvec_inner_product' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION cosine_distance(halfvec, halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'halfvec_cosine_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l1_distance(halfvec, halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'halfvec_l1_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION vector_dims(halfvec) RETURNS integer
-	AS 'MODULE_PATHNAME', 'halfvec_vector_dims' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l2_norm(halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'halfvec_l2_norm' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l2_normalize(halfvec) RETURNS halfvec
-	AS 'MODULE_PATHNAME', 'halfvec_l2_normalize' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION binary_quantize(halfvec) RETURNS bit
-	AS 'MODULE_PATHNAME', 'halfvec_binary_quantize' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION subvector(halfvec, int, int) RETURNS halfvec
-	AS 'MODULE_PATHNAME', 'halfvec_subvector' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- halfvec private functions
-
-CREATE FUNCTION halfvec_add(halfvec, halfvec) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_sub(halfvec, halfvec) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_mul(halfvec, halfvec) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_concat(halfvec, halfvec) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_lt(halfvec, halfvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_le(halfvec, halfvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_eq(halfvec, halfvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_ne(halfvec, halfvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_ge(halfvec, halfvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_gt(halfvec, halfvec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_cmp(halfvec, halfvec) RETURNS int4
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_l2_squared_distance(halfvec, halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_negative_inner_product(halfvec, halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_spherical_distance(halfvec, halfvec) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_accum(double precision[], halfvec) RETURNS double precision[]
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_avg(double precision[]) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_ivfflat_support(internal) RETURNS internal
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_hnsw_support(internal) RETURNS internal
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- halfvec aggregates
-
-CREATE AGGREGATE avg(halfvec) (
-	SFUNC = halfvec_accum,
-	STYPE = double precision[],
-	FINALFUNC = halfvec_avg,
-	COMBINEFUNC = vector_combine,
-	INITCOND = '{0}',
-	PARALLEL = SAFE
-);
-
-CREATE AGGREGATE sum(halfvec) (
-	SFUNC = halfvec_add,
-	STYPE = halfvec,
-	COMBINEFUNC = halfvec_add,
-	PARALLEL = SAFE
-);
-
--- halfvec cast functions
-
-CREATE FUNCTION halfvec(halfvec, integer, boolean) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_to_vector(halfvec, integer, boolean) RETURNS vector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION vector_to_halfvec(vector, integer, boolean) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION array_to_halfvec(integer[], integer, boolean) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION array_to_halfvec(real[], integer, boolean) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION array_to_halfvec(double precision[], integer, boolean) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION array_to_halfvec(numeric[], integer, boolean) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_to_float4(halfvec, integer, boolean) RETURNS real[]
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- halfvec casts
-
-CREATE CAST (halfvec AS halfvec)
-	WITH FUNCTION halfvec(halfvec, integer, boolean) AS IMPLICIT;
-
-CREATE CAST (halfvec AS vector)
-	WITH FUNCTION halfvec_to_vector(halfvec, integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (vector AS halfvec)
-	WITH FUNCTION vector_to_halfvec(vector, integer, boolean) AS IMPLICIT;
-
-CREATE CAST (halfvec AS real[])
-	WITH FUNCTION halfvec_to_float4(halfvec, integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (integer[] AS halfvec)
-	WITH FUNCTION array_to_halfvec(integer[], integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (real[] AS halfvec)
-	WITH FUNCTION array_to_halfvec(real[], integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (double precision[] AS halfvec)
-	WITH FUNCTION array_to_halfvec(double precision[], integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (numeric[] AS halfvec)
-	WITH FUNCTION array_to_halfvec(numeric[], integer, boolean) AS ASSIGNMENT;
-
--- halfvec operators
-
-CREATE OPERATOR <-> (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = l2_distance,
-	COMMUTATOR = '<->'
-);
-
-CREATE OPERATOR <#> (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_negative_inner_product,
-	COMMUTATOR = '<#>'
-);
-
-CREATE OPERATOR <=> (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = cosine_distance,
-	COMMUTATOR = '<=>'
-);
-
-CREATE OPERATOR <+> (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = l1_distance,
-	COMMUTATOR = '<+>'
-);
-
-CREATE OPERATOR + (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_add,
-	COMMUTATOR = +
-);
-
-CREATE OPERATOR - (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_sub
-);
-
-CREATE OPERATOR * (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_mul,
-	COMMUTATOR = *
-);
-
-CREATE OPERATOR || (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_concat
-);
-
-CREATE OPERATOR < (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_lt,
-	COMMUTATOR = > , NEGATOR = >= ,
-	RESTRICT = scalarltsel, JOIN = scalarltjoinsel
-);
-
-CREATE OPERATOR <= (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_le,
-	COMMUTATOR = >= , NEGATOR = > ,
-	RESTRICT = scalarlesel, JOIN = scalarlejoinsel
-);
-
-CREATE OPERATOR = (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_eq,
-	COMMUTATOR = = , NEGATOR = <> ,
-	RESTRICT = eqsel, JOIN = eqjoinsel
-);
-
-CREATE OPERATOR <> (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_ne,
-	COMMUTATOR = <> , NEGATOR = = ,
-	RESTRICT = eqsel, JOIN = eqjoinsel
-);
-
-CREATE OPERATOR >= (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_ge,
-	COMMUTATOR = <= , NEGATOR = < ,
-	RESTRICT = scalargesel, JOIN = scalargejoinsel
-);
-
-CREATE OPERATOR > (
-	LEFTARG = halfvec, RIGHTARG = halfvec, PROCEDURE = halfvec_gt,
-	COMMUTATOR = < , NEGATOR = <= ,
-	RESTRICT = scalargtsel, JOIN = scalargtjoinsel
-);
-
--- halfvec opclasses
-
-CREATE OPERATOR CLASS halfvec_ops
-	DEFAULT FOR TYPE halfvec USING btree AS
-	OPERATOR 1 < ,
-	OPERATOR 2 <= ,
-	OPERATOR 3 = ,
-	OPERATOR 4 >= ,
-	OPERATOR 5 > ,
-	FUNCTION 1 halfvec_cmp(halfvec, halfvec);
-
-CREATE OPERATOR CLASS halfvec_l2_ops
-	FOR TYPE halfvec USING ivfflat AS
-	OPERATOR 1 <-> (halfvec, halfvec) FOR ORDER BY float_ops,
-	FUNCTION 1 halfvec_l2_squared_distance(halfvec, halfvec),
-	FUNCTION 3 l2_distance(halfvec, halfvec),
-	FUNCTION 6 halfvec_ivfflat_support(internal);
-
-CREATE OPERATOR CLASS halfvec_ip_ops
-	FOR TYPE halfvec USING ivfflat AS
-	OPERATOR 1 <#> (halfvec, halfvec) FOR ORDER BY float_ops,
-	FUNCTION 1 halfvec_negative_inner_product(halfvec, halfvec),
-	FUNCTION 3 halfvec_spherical_distance(halfvec, halfvec),
-	FUNCTION 4 l2_norm(halfvec),
-	FUNCTION 5 l2_normalize(halfvec),
-	FUNCTION 6 halfvec_ivfflat_support(internal);
-
-CREATE OPERATOR CLASS halfvec_cosine_ops
-	FOR TYPE halfvec USING ivfflat AS
-	OPERATOR 1 <=> (halfvec, halfvec) FOR ORDER BY float_ops,
-	FUNCTION 1 halfvec_negative_inner_product(halfvec, halfvec),
-	FUNCTION 2 l2_norm(halfvec),
-	FUNCTION 3 halfvec_spherical_distance(halfvec, halfvec),
-	FUNCTION 4 l2_norm(halfvec),
-	FUNCTION 5 l2_normalize(halfvec),
-	FUNCTION 6 halfvec_ivfflat_support(internal);
-
-CREATE OPERATOR CLASS halfvec_l2_ops
-	FOR TYPE halfvec USING hnsw AS
-	OPERATOR 1 <-> (halfvec, halfvec) FOR ORDER BY float_ops,
-	FUNCTION 1 halfvec_l2_squared_distance(halfvec, halfvec),
-	FUNCTION 4 halfvec_hnsw_support(internal);
-
-CREATE OPERATOR CLASS halfvec_ip_ops
-	FOR TYPE halfvec USING hnsw AS
-	OPERATOR 1 <#> (halfvec, halfvec) FOR ORDER BY float_ops,
-	FUNCTION 1 halfvec_negative_inner_product(halfvec, halfvec),
-	FUNCTION 4 halfvec_hnsw_support(internal);
-
-CREATE OPERATOR CLASS halfvec_cosine_ops
-	FOR TYPE halfvec USING hnsw AS
-	OPERATOR 1 <=> (halfvec, halfvec) FOR ORDER BY float_ops,
-	FUNCTION 1 halfvec_negative_inner_product(halfvec, halfvec),
-	FUNCTION 2 l2_norm(halfvec),
-	FUNCTION 3 l2_normalize(halfvec),
-	FUNCTION 4 halfvec_hnsw_support(internal);
-
-CREATE OPERATOR CLASS halfvec_l1_ops
-	FOR TYPE halfvec USING hnsw AS
-	OPERATOR 1 <+> (halfvec, halfvec) FOR ORDER BY float_ops,
-	FUNCTION 1 l1_distance(halfvec, halfvec),
-	FUNCTION 4 halfvec_hnsw_support(internal);
-
---- sparsevec type
-
-CREATE TYPE sparsevec;
-
-CREATE FUNCTION sparsevec_in(cstring, oid, integer) RETURNS sparsevec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_out(sparsevec) RETURNS cstring
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_typmod_in(cstring[]) RETURNS integer
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_recv(internal, oid, integer) RETURNS sparsevec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_send(sparsevec) RETURNS bytea
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE TYPE sparsevec (
-	INPUT     = sparsevec_in,
-	OUTPUT    = sparsevec_out,
-	TYPMOD_IN = sparsevec_typmod_in,
-	RECEIVE   = sparsevec_recv,
-	SEND      = sparsevec_send,
-	STORAGE   = external
-);
-
--- sparsevec functions
-
-CREATE FUNCTION l2_distance(sparsevec, sparsevec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'sparsevec_l2_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION inner_product(sparsevec, sparsevec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'sparsevec_inner_product' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION cosine_distance(sparsevec, sparsevec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'sparsevec_cosine_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l1_distance(sparsevec, sparsevec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'sparsevec_l1_distance' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l2_norm(sparsevec) RETURNS float8
-	AS 'MODULE_PATHNAME', 'sparsevec_l2_norm' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION l2_normalize(sparsevec) RETURNS sparsevec
-	AS 'MODULE_PATHNAME', 'sparsevec_l2_normalize' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- sparsevec private functions
-
-CREATE FUNCTION sparsevec_lt(sparsevec, sparsevec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_le(sparsevec, sparsevec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_eq(sparsevec, sparsevec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_ne(sparsevec, sparsevec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_ge(sparsevec, sparsevec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_gt(sparsevec, sparsevec) RETURNS bool
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_cmp(sparsevec, sparsevec) RETURNS int4
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_l2_squared_distance(sparsevec, sparsevec) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_negative_inner_product(sparsevec, sparsevec) RETURNS float8
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- sparsevec cast functions
-
-CREATE FUNCTION sparsevec(sparsevec, integer, boolean) RETURNS sparsevec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION vector_to_sparsevec(vector, integer, boolean) RETURNS sparsevec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_to_vector(sparsevec, integer, boolean) RETURNS vector
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION halfvec_to_sparsevec(halfvec, integer, boolean) RETURNS sparsevec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_to_halfvec(sparsevec, integer, boolean) RETURNS halfvec
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
-CREATE FUNCTION sparsevec_hnsw_support(internal) RETURNS internal
-	AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-
--- sparsevec casts
-
-CREATE CAST (sparsevec AS sparsevec)
-	WITH FUNCTION sparsevec(sparsevec, integer, boolean) AS IMPLICIT;
-
-CREATE CAST (sparsevec AS vector)
-	WITH FUNCTION sparsevec_to_vector(sparsevec, integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (vector AS sparsevec)
-	WITH FUNCTION vector_to_sparsevec(vector, integer, boolean) AS IMPLICIT;
-
-CREATE CAST (sparsevec AS halfvec)
-	WITH FUNCTION sparsevec_to_halfvec(sparsevec, integer, boolean) AS ASSIGNMENT;
-
-CREATE CAST (halfvec AS sparsevec)
-	WITH FUNCTION halfvec_to_sparsevec(halfvec, integer, boolean) AS IMPLICIT;
-
--- sparsevec operators
-
-CREATE OPERATOR <-> (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = l2_distance,
-	COMMUTATOR = '<->'
-);
-
-CREATE OPERATOR <#> (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = sparsevec_negative_inner_product,
-	COMMUTATOR = '<#>'
-);
-
-CREATE OPERATOR <=> (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = cosine_distance,
-	COMMUTATOR = '<=>'
-);
-
-CREATE OPERATOR <+> (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = l1_distance,
-	COMMUTATOR = '<+>'
-);
-
-CREATE OPERATOR < (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = sparsevec_lt,
-	COMMUTATOR = > , NEGATOR = >= ,
-	RESTRICT = scalarltsel, JOIN = scalarltjoinsel
-);
-
-CREATE OPERATOR <= (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = sparsevec_le,
-	COMMUTATOR = >= , NEGATOR = > ,
-	RESTRICT = scalarlesel, JOIN = scalarlejoinsel
-);
-
-CREATE OPERATOR = (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = sparsevec_eq,
-	COMMUTATOR = = , NEGATOR = <> ,
-	RESTRICT = eqsel, JOIN = eqjoinsel
-);
-
-CREATE OPERATOR <> (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = sparsevec_ne,
-	COMMUTATOR = <> , NEGATOR = = ,
-	RESTRICT = eqsel, JOIN = eqjoinsel
-);
-
-CREATE OPERATOR >= (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = sparsevec_ge,
-	COMMUTATOR = <= , NEGATOR = < ,
-	RESTRICT = scalargesel, JOIN = scalargejoinsel
-);
-
-CREATE OPERATOR > (
-	LEFTARG = sparsevec, RIGHTARG = sparsevec, PROCEDURE = sparsevec_gt,
-	COMMUTATOR = < , NEGATOR = <= ,
-	RESTRICT = scalargtsel, JOIN = scalargtjoinsel
-);
-
--- sparsevec opclasses
-
-CREATE OPERATOR CLASS sparsevec_ops
-	DEFAULT FOR TYPE sparsevec USING btree AS
-	OPERATOR 1 < ,
-	OPERATOR 2 <= ,
-	OPERATOR 3 = ,
-	OPERATOR 4 >= ,
-	OPERATOR 5 > ,
-	FUNCTION 1 sparsevec_cmp(sparsevec, sparsevec);
-
-CREATE OPERATOR CLASS sparsevec_l2_ops
-	FOR TYPE sparsevec USING hnsw AS
-	OPERATOR 1 <-> (sparsevec, sparsevec) FOR ORDER BY float_ops,
-	FUNCTION 1 sparsevec_l2_squared_distance(sparsevec, sparsevec),
-	FUNCTION 4 sparsevec_hnsw_support(internal);
-
-CREATE OPERATOR CLASS sparsevec_ip_ops
-	FOR TYPE sparsevec USING hnsw AS
-	OPERATOR 1 <#> (sparsevec, sparsevec) FOR ORDER BY float_ops,
-	FUNCTION 1 sparsevec_negative_inner_product(sparsevec, sparsevec),
-	FUNCTION 4 sparsevec_hnsw_support(internal);
-
-CREATE OPERATOR CLASS sparsevec_cosine_ops
-	FOR TYPE sparsevec USING hnsw AS
-	OPERATOR 1 <=> (sparsevec, sparsevec) FOR ORDER BY float_ops,
-	FUNCTION 1 sparsevec_negative_inner_product(sparsevec, sparsevec),
-	FUNCTION 2 l2_norm(sparsevec),
-	FUNCTION 3 l2_normalize(sparsevec),
-	FUNCTION 4 sparsevec_hnsw_support(internal);
-
-CREATE OPERATOR CLASS sparsevec_l1_ops
-	FOR TYPE sparsevec USING hnsw AS
-	OPERATOR 1 <+> (sparsevec, sparsevec) FOR ORDER BY float_ops,
-	FUNCTION 1 l1_distance(sparsevec, sparsevec),
-	FUNCTION 4 sparsevec_hnsw_support(internal);

src/bitutils.c

@@ -1,217 +0,0 @@
-#include "postgres.h"
-
-#include "bitutils.h"
-#include "port/pg_bitutils.h"
-
-#ifdef BIT_DISPATCH
-#include <immintrin.h>
-
-#if defined(HAVE__GET_CPUID)
-#include <cpuid.h>
-#else
-#include <intrin.h>
-#endif
-
-#ifdef _MSC_VER
-#define TARGET_AVX512_POPCOUNT
-#else
-#define TARGET_AVX512_POPCOUNT __attribute__((target("avx512f,avx512vpopcntdq")))
-#endif
-#endif
-
-/* Disable for LLVM due to crash with bitcode generation */
-#if defined(USE_TARGET_CLONES) && !defined(__POPCNT__) && !defined(__llvm__)
-#define BIT_TARGET_CLONES __attribute__((target_clones("default", "popcnt")))
-#else
-#define BIT_TARGET_CLONES
-#endif
-
-/* Use built-ins when possible for inlining */
-#if defined(HAVE__BUILTIN_POPCOUNT) && defined(HAVE_LONG_INT_64)
-#define popcount64(x) __builtin_popcountl(x)
-#elif defined(HAVE__BUILTIN_POPCOUNT) && defined(HAVE_LONG_LONG_INT_64)
-#define popcount64(x) __builtin_popcountll(x)
-#elif !defined(_MSC_VER)
-/* Fails to resolve with MSVC */
-#define popcount64(x) pg_popcount64(x)
-#endif
-
-uint64		(*BitHammingDistance) (uint32 bytes, unsigned char *ax, unsigned char *bx, uint64 distance);
-double		(*BitJaccardDistance) (uint32 bytes, unsigned char *ax, unsigned char *bx, uint64 ab, uint64 aa, uint64 bb);
-
-BIT_TARGET_CLONES static uint64
-BitHammingDistanceDefault(uint32 bytes, unsigned char *ax, unsigned char *bx, uint64 distance)
-{
-#ifdef popcount64
-	for (; bytes >= sizeof(uint64); bytes -= sizeof(uint64))
-	{
-		uint64		axs;
-		uint64		bxs;
-
-		/* Ensure aligned */
-		memcpy(&axs, ax, sizeof(uint64));
-		memcpy(&bxs, bx, sizeof(uint64));
-
-		distance += popcount64(axs ^ bxs);
-
-		ax += sizeof(uint64);
-		bx += sizeof(uint64);
-	}
-#endif
-
-	for (uint32 i = 0; i < bytes; i++)
-		distance += pg_number_of_ones[ax[i] ^ bx[i]];
-
-	return distance;
-}
-
-#ifdef BIT_DISPATCH
-TARGET_AVX512_POPCOUNT static uint64
-BitHammingDistanceAvx512Popcount(uint32 bytes, unsigned char *ax, unsigned char *bx, uint64 distance)
-{
-	__m512i		dist = _mm512_setzero_si512();
-
-	for (; bytes >= sizeof(__m512i); bytes -= sizeof(__m512i))
-	{
-		__m512i		axs = _mm512_loadu_si512((const __m512i *) ax);
-		__m512i		bxs = _mm512_loadu_si512((const __m512i *) bx);
-
-		dist = _mm512_add_epi64(dist, _mm512_popcnt_epi64(_mm512_xor_si512(axs, bxs)));
-
-		ax += sizeof(__m512i);
-		bx += sizeof(__m512i);
-	}
-
-	distance += _mm512_reduce_add_epi64(dist);
-
-	return BitHammingDistanceDefault(bytes, ax, bx, distance);
-}
-#endif
-
-BIT_TARGET_CLONES static double
-BitJaccardDistanceDefault(uint32 bytes, unsigned char *ax, unsigned char *bx, uint64 ab, uint64 aa, uint64 bb)
-{
-#ifdef popcount64
-	for (; bytes >= sizeof(uint64); bytes -= sizeof(uint64))
-	{
-		uint64		axs;
-		uint64		bxs;
-
-		/* Ensure aligned */
-		memcpy(&axs, ax, sizeof(uint64));
-		memcpy(&bxs, bx, sizeof(uint64));
-
-		ab += popcount64(axs & bxs);
-		aa += popcount64(axs);
-		bb += popcount64(bxs);
-
-		ax += sizeof(uint64);
-		bx += sizeof(uint64);
-	}
-#endif
-
-	for (uint32 i = 0; i < bytes; i++)
-	{
-		ab += pg_number_of_ones[ax[i] & bx[i]];
-		aa += pg_number_of_ones[ax[i]];
-		bb += pg_number_of_ones[bx[i]];
-	}
-
-	if (ab == 0)
-		return 1;
-	else
-		return 1 - (ab / ((double) (aa + bb - ab)));
-}
-
-#ifdef BIT_DISPATCH
-TARGET_AVX512_POPCOUNT static double
-BitJaccardDistanceAvx512Popcount(uint32 bytes, unsigned char *ax, unsigned char *bx, uint64 ab, uint64 aa, uint64 bb)
-{
-	__m512i		abx = _mm512_setzero_si512();
-	__m512i		aax = _mm512_setzero_si512();
-	__m512i		bbx = _mm512_setzero_si512();
-
-	for (; bytes >= sizeof(__m512i); bytes -= sizeof(__m512i))
-	{
-		__m512i		axs = _mm512_loadu_si512((const __m512i *) ax);
-		__m512i		bxs = _mm512_loadu_si512((const __m512i *) bx);
-
-		abx = _mm512_add_epi64(abx, _mm512_popcnt_epi64(_mm512_and_si512(axs, bxs)));
-		aax = _mm512_add_epi64(aax, _mm512_popcnt_epi64(axs));
-		bbx = _mm512_add_epi64(bbx, _mm512_popcnt_epi64(bxs));
-
-		ax += sizeof(__m512i);
-		bx += sizeof(__m512i);
-	}
-
-	ab += _mm512_reduce_add_epi64(abx);
-	aa += _mm512_reduce_add_epi64(aax);
-	bb += _mm512_reduce_add_epi64(bbx);
-
-	return BitJaccardDistanceDefault(bytes, ax, bx, ab, aa, bb);
-}
-#endif
-
-#ifdef BIT_DISPATCH
-#define CPU_FEATURE_OSXSAVE         (1 << 27)	/* F1 ECX */
-#define CPU_FEATURE_AVX512F         (1 << 16)	/* F7,0 EBX */
-#define CPU_FEATURE_AVX512VPOPCNTDQ (1 << 14)	/* F7,0 ECX */
-
-#ifdef _MSC_VER
-#define TARGET_XSAVE
-#else
-#define TARGET_XSAVE __attribute__((target("xsave")))
-#endif
-
-TARGET_XSAVE static bool
-SupportsAvx512Popcount()
-{
-	unsigned int exx[4] = {0, 0, 0, 0};
-
-#if defined(HAVE__GET_CPUID)
-	__get_cpuid(1, &exx[0], &exx[1], &exx[2], &exx[3]);
-#else
-	__cpuid(exx, 1);
-#endif
-
-	/* Check OS supports XSAVE */
-	if ((exx[2] & CPU_FEATURE_OSXSAVE) != CPU_FEATURE_OSXSAVE)
-		return false;
-
-	/* Check XMM, YMM, and ZMM registers are enabled */
-	if ((_xgetbv(0) & 0xe6) != 0xe6)
-		return false;
-
-#if defined(HAVE__GET_CPUID)
-	__get_cpuid_count(7, 0, &exx[0], &exx[1], &exx[2], &exx[3]);
-#else
-	__cpuidex(exx, 7, 0);
-#endif
-
-	/* Check AVX512F */
-	if ((exx[1] & CPU_FEATURE_AVX512F) != CPU_FEATURE_AVX512F)
-		return false;
-
-	/* Check AVX512VPOPCNTDQ */
-	return (exx[2] & CPU_FEATURE_AVX512VPOPCNTDQ) == CPU_FEATURE_AVX512VPOPCNTDQ;
-}
-#endif
-
-void
-BitvecInit(void)
-{
-	/*
-	 * Could skip pointer when single function, but no difference in
-	 * performance
-	 */
-	BitHammingDistance = BitHammingDistanceDefault;
-	BitJaccardDistance = BitJaccardDistanceDefault;
-
-#ifdef BIT_DISPATCH
-	if (SupportsAvx512Popcount())
-	{
-		BitHammingDistance = BitHammingDistanceAvx512Popcount;
-		BitJaccardDistance = BitJaccardDistanceAvx512Popcount;
-	}
-#endif
-}

src/bitutils.h

@@ -1,31 +0,0 @@
-#ifndef BITUTILS_H
-#define BITUTILS_H
-
-/* We use two types of dispatching: intrinsics and target_clones */
-/* TODO Move to better place */
-#ifndef DISABLE_DISPATCH
-/* Only enable for more recent compilers to keep build process simple */
-#if defined(__x86_64__) && defined(__GNUC__) && __GNUC__ >= 8
-#define USE_DISPATCH
-#elif defined(__x86_64__) && defined(__clang_major__) && __clang_major__ >= 7
-#define USE_DISPATCH
-#elif defined(_M_AMD64) && defined(_MSC_VER) && _MSC_VER >= 1920
-#define USE_DISPATCH
-#endif
-#endif
-
-/* target_clones requires glibc */
-#if defined(USE_DISPATCH) && defined(__gnu_linux__)
-#define USE_TARGET_CLONES
-#endif
-
-#if defined(USE_DISPATCH)
-#define BIT_DISPATCH
-#endif
-
-extern uint64 (*BitHammingDistance) (uint32 bytes, unsigned char *ax, unsigned char *bx, uint64 distance);
-extern double (*BitJaccardDistance) (uint32 bytes, unsigned char *ax, unsigned char *bx, uint64 ab, uint64 aa, uint64 bb);
-
-void		BitvecInit(void);
-
-#endif

src/bitvector.c

@@ -1,7 +1,7 @@
 #include "postgres.h"
 
-#include "bitutils.h"
+#include "bitvector.h"
-#include "bitvec.h"
+#include "port/pg_bitutils.h"
 #include "utils/varbit.h"
 
 #if PG_VERSION_NUM >= 160000
@@ -46,10 +46,17 @@ 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);
 
-	PG_RETURN_FLOAT8((double) BitHammingDistance(VARBITBYTES(a), VARBITS(a), VARBITS(b), 0));
+	/* 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);
 }
 
 /*
@@ -61,8 +68,23 @@ 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);
 
-	PG_RETURN_FLOAT8(BitJaccardDistance(VARBITBYTES(a), VARBITS(a), VARBITS(b), 0, 0, 0));
+	/* 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/halfutils.c

@@ -1,298 +0,0 @@
-#include "postgres.h"
-
-#include "halfutils.h"
-#include "halfvec.h"
-
-#ifdef HALFVEC_DISPATCH
-#include <immintrin.h>
-
-#if defined(HAVE__GET_CPUID)
-#include <cpuid.h>
-#else
-#include <intrin.h>
-#endif
-
-#ifdef _MSC_VER
-#define TARGET_F16C
-#else
-#define TARGET_F16C __attribute__((target("avx,f16c,fma")))
-#endif
-#endif
-
-float		(*HalfvecL2SquaredDistance) (int dim, half * ax, half * bx);
-float		(*HalfvecInnerProduct) (int dim, half * ax, half * bx);
-double		(*HalfvecCosineSimilarity) (int dim, half * ax, half * bx);
-float		(*HalfvecL1Distance) (int dim, half * ax, half * bx);
-
-static float
-HalfvecL2SquaredDistanceDefault(int dim, half * ax, half * bx)
-{
-	float		distance = 0.0;
-
-	/* Auto-vectorized */
-	for (int i = 0; i < dim; i++)
-	{
-		float		diff = HalfToFloat4(ax[i]) - HalfToFloat4(bx[i]);
-
-		distance += diff * diff;
-	}
-
-	return distance;
-}
-
-#ifdef HALFVEC_DISPATCH
-TARGET_F16C static float
-HalfvecL2SquaredDistanceF16c(int dim, half * ax, half * bx)
-{
-	float		distance;
-	int			i;
-	float		s[8];
-	int			count = (dim / 8) * 8;
-	__m256		dist = _mm256_setzero_ps();
-
-	for (i = 0; i < count; i += 8)
-	{
-		__m128i		axi = _mm_loadu_si128((__m128i *) (ax + i));
-		__m128i		bxi = _mm_loadu_si128((__m128i *) (bx + i));
-		__m256		axs = _mm256_cvtph_ps(axi);
-		__m256		bxs = _mm256_cvtph_ps(bxi);
-		__m256		diff = _mm256_sub_ps(axs, bxs);
-
-		dist = _mm256_fmadd_ps(diff, diff, dist);
-	}
-
-	_mm256_storeu_ps(s, dist);
-
-	distance = s[0] + s[1] + s[2] + s[3] + s[4] + s[5] + s[6] + s[7];
-
-	for (; i < dim; i++)
-	{
-		float		diff = HalfToFloat4(ax[i]) - HalfToFloat4(bx[i]);
-
-		distance += diff * diff;
-	}
-
-	return distance;
-}
-#endif
-
-static float
-HalfvecInnerProductDefault(int dim, half * ax, half * bx)
-{
-	float		distance = 0.0;
-
-	/* Auto-vectorized */
-	for (int i = 0; i < dim; i++)
-		distance += HalfToFloat4(ax[i]) * HalfToFloat4(bx[i]);
-
-	return distance;
-}
-
-#ifdef HALFVEC_DISPATCH
-TARGET_F16C static float
-HalfvecInnerProductF16c(int dim, half * ax, half * bx)
-{
-	float		distance;
-	int			i;
-	float		s[8];
-	int			count = (dim / 8) * 8;
-	__m256		dist = _mm256_setzero_ps();
-
-	for (i = 0; i < count; i += 8)
-	{
-		__m128i		axi = _mm_loadu_si128((__m128i *) (ax + i));
-		__m128i		bxi = _mm_loadu_si128((__m128i *) (bx + i));
-		__m256		axs = _mm256_cvtph_ps(axi);
-		__m256		bxs = _mm256_cvtph_ps(bxi);
-
-		dist = _mm256_fmadd_ps(axs, bxs, dist);
-	}
-
-	_mm256_storeu_ps(s, dist);
-
-	distance = s[0] + s[1] + s[2] + s[3] + s[4] + s[5] + s[6] + s[7];
-
-	for (; i < dim; i++)
-		distance += HalfToFloat4(ax[i]) * HalfToFloat4(bx[i]);
-
-	return distance;
-}
-#endif
-
-static double
-HalfvecCosineSimilarityDefault(int dim, half * ax, half * bx)
-{
-	float		similarity = 0.0;
-	float		norma = 0.0;
-	float		normb = 0.0;
-
-	/* Auto-vectorized */
-	for (int i = 0; i < dim; i++)
-	{
-		float		axi = HalfToFloat4(ax[i]);
-		float		bxi = HalfToFloat4(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);
-}
-
-#ifdef HALFVEC_DISPATCH
-TARGET_F16C static double
-HalfvecCosineSimilarityF16c(int dim, half * ax, half * bx)
-{
-	float		similarity;
-	float		norma;
-	float		normb;
-	int			i;
-	float		s[8];
-	int			count = (dim / 8) * 8;
-	__m256		sim = _mm256_setzero_ps();
-	__m256		na = _mm256_setzero_ps();
-	__m256		nb = _mm256_setzero_ps();
-
-	for (i = 0; i < count; i += 8)
-	{
-		__m128i		axi = _mm_loadu_si128((__m128i *) (ax + i));
-		__m128i		bxi = _mm_loadu_si128((__m128i *) (bx + i));
-		__m256		axs = _mm256_cvtph_ps(axi);
-		__m256		bxs = _mm256_cvtph_ps(bxi);
-
-		sim = _mm256_fmadd_ps(axs, bxs, sim);
-		na = _mm256_fmadd_ps(axs, axs, na);
-		nb = _mm256_fmadd_ps(bxs, bxs, nb);
-	}
-
-	_mm256_storeu_ps(s, sim);
-	similarity = s[0] + s[1] + s[2] + s[3] + s[4] + s[5] + s[6] + s[7];
-
-	_mm256_storeu_ps(s, na);
-	norma = s[0] + s[1] + s[2] + s[3] + s[4] + s[5] + s[6] + s[7];
-
-	_mm256_storeu_ps(s, nb);
-	normb = s[0] + s[1] + s[2] + s[3] + s[4] + s[5] + s[6] + s[7];
-
-	/* Auto-vectorized */
-	for (; i < dim; i++)
-	{
-		float		axi = HalfToFloat4(ax[i]);
-		float		bxi = HalfToFloat4(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);
-}
-#endif
-
-static float
-HalfvecL1DistanceDefault(int dim, half * ax, half * bx)
-{
-	float		distance = 0.0;
-
-	/* Auto-vectorized */
-	for (int i = 0; i < dim; i++)
-		distance += fabsf(HalfToFloat4(ax[i]) - HalfToFloat4(bx[i]));
-
-	return distance;
-}
-
-#ifdef HALFVEC_DISPATCH
-/* Does not require FMA, but keep logic simple */
-TARGET_F16C static float
-HalfvecL1DistanceF16c(int dim, half * ax, half * bx)
-{
-	float		distance;
-	int			i;
-	float		s[8];
-	int			count = (dim / 8) * 8;
-	__m256		dist = _mm256_setzero_ps();
-	__m256		sign = _mm256_set1_ps(-0.0);
-
-	for (i = 0; i < count; i += 8)
-	{
-		__m128i		axi = _mm_loadu_si128((__m128i *) (ax + i));
-		__m128i		bxi = _mm_loadu_si128((__m128i *) (bx + i));
-		__m256		axs = _mm256_cvtph_ps(axi);
-		__m256		bxs = _mm256_cvtph_ps(bxi);
-
-		dist = _mm256_add_ps(dist, _mm256_andnot_ps(sign, _mm256_sub_ps(axs, bxs)));
-	}
-
-	_mm256_storeu_ps(s, dist);
-
-	distance = s[0] + s[1] + s[2] + s[3] + s[4] + s[5] + s[6] + s[7];
-
-	for (; i < dim; i++)
-		distance += fabsf(HalfToFloat4(ax[i]) - HalfToFloat4(bx[i]));
-
-	return distance;
-}
-#endif
-
-#ifdef HALFVEC_DISPATCH
-#define CPU_FEATURE_FMA     (1 << 12)
-#define CPU_FEATURE_OSXSAVE (1 << 27)
-#define CPU_FEATURE_AVX     (1 << 28)
-#define CPU_FEATURE_F16C    (1 << 29)
-
-#ifdef _MSC_VER
-#define TARGET_XSAVE
-#else
-#define TARGET_XSAVE __attribute__((target("xsave")))
-#endif
-
-TARGET_XSAVE static bool
-SupportsCpuFeature(unsigned int feature)
-{
-	unsigned int exx[4] = {0, 0, 0, 0};
-
-#if defined(HAVE__GET_CPUID)
-	__get_cpuid(1, &exx[0], &exx[1], &exx[2], &exx[3]);
-#else
-	__cpuid(exx, 1);
-#endif
-
-	/* Check OS supports XSAVE */
-	if ((exx[2] & CPU_FEATURE_OSXSAVE) != CPU_FEATURE_OSXSAVE)
-		return false;
-
-	/* Check XMM and YMM registers are enabled */
-	if ((_xgetbv(0) & 6) != 6)
-		return false;
-
-	/* Now check features */
-	return (exx[2] & feature) == feature;
-}
-#endif
-
-void
-HalfvecInit(void)
-{
-	/*
-	 * Could skip pointer when single function, but no difference in
-	 * performance
-	 */
-	HalfvecL2SquaredDistance = HalfvecL2SquaredDistanceDefault;
-	HalfvecInnerProduct = HalfvecInnerProductDefault;
-	HalfvecCosineSimilarity = HalfvecCosineSimilarityDefault;
-	HalfvecL1Distance = HalfvecL1DistanceDefault;
-
-#ifdef HALFVEC_DISPATCH
-	if (SupportsCpuFeature(CPU_FEATURE_AVX | CPU_FEATURE_F16C | CPU_FEATURE_FMA))
-	{
-		HalfvecL2SquaredDistance = HalfvecL2SquaredDistanceF16c;
-		HalfvecInnerProduct = HalfvecInnerProductF16c;
-		HalfvecCosineSimilarity = HalfvecCosineSimilarityF16c;
-		/* Does not require FMA, but keep logic simple */
-		HalfvecL1Distance = HalfvecL1DistanceF16c;
-	}
-#endif
-}

src/halfutils.h

@@ -1,269 +0,0 @@
-#ifndef HALFUTILS_H
-#define HALFUTILS_H
-
-#include <math.h>
-
-#include "common/shortest_dec.h"
-#include "halfvec.h"
-
-#ifdef F16C_SUPPORT
-#include <immintrin.h>
-#endif
-
-extern float (*HalfvecL2SquaredDistance) (int dim, half * ax, half * bx);
-extern float (*HalfvecInnerProduct) (int dim, half * ax, half * bx);
-extern double (*HalfvecCosineSimilarity) (int dim, half * ax, half * bx);
-extern float (*HalfvecL1Distance) (int dim, half * ax, half * bx);
-
-void		HalfvecInit(void);
-
-/*
- * Check if half is NaN
- */
-static inline bool
-HalfIsNan(half num)
-{
-#ifdef FLT16_SUPPORT
-	return isnan(num);
-#else
-	return (num & 0x7C00) == 0x7C00 && (num & 0x7FFF) != 0x7C00;
-#endif
-}
-
-/*
- * Check if half is infinite
- */
-static inline bool
-HalfIsInf(half num)
-{
-#ifdef FLT16_SUPPORT
-	return isinf(num);
-#else
-	return (num & 0x7FFF) == 0x7C00;
-#endif
-}
-
-/*
- * Check if half is zero
- */
-static inline bool
-HalfIsZero(half num)
-{
-#ifdef FLT16_SUPPORT
-	return num == 0;
-#else
-	return (num & 0x7FFF) == 0x0000;
-#endif
-}
-
-/*
- * Convert a half to a float4
- */
-static inline float
-HalfToFloat4(half num)
-{
-#if defined(F16C_SUPPORT)
-	return _cvtsh_ss(num);
-#elif defined(FLT16_SUPPORT)
-	return (float) num;
-#else
-	/* TODO Improve performance */
-
-	/* Assumes same endianness for floats and integers */
-	union
-	{
-		float		f;
-		uint32		i;
-	}			swapfloat;
-
-	union
-	{
-		half		h;
-		uint16		i;
-	}			swaphalf;
-
-	uint16		bin;
-	uint32		exponent;
-	uint32		mantissa;
-	uint32		result;
-
-	swaphalf.h = num;
-	bin = swaphalf.i;
-	exponent = (bin & 0x7C00) >> 10;
-	mantissa = bin & 0x03FF;
-
-	/* Sign */
-	result = (bin & 0x8000) << 16;
-
-	if (unlikely(exponent == 31))
-	{
-		if (mantissa == 0)
-		{
-			/* Infinite */
-			result |= 0x7F800000;
-		}
-		else
-		{
-			/* NaN */
-			result |= 0x7FC00000;
-		}
-	}
-	else if (unlikely(exponent == 0))
-	{
-		/* Subnormal */
-		if (mantissa != 0)
-		{
-			exponent = -14;
-
-			for (int i = 0; i < 10; i++)
-			{
-				mantissa <<= 1;
-				exponent -= 1;
-
-				if ((mantissa >> 10) % 2 == 1)
-				{
-					mantissa &= 0x03ff;
-					break;
-				}
-			}
-
-			result |= (exponent + 127) << 23;
-		}
-	}
-	else
-	{
-		/* Normal */
-		result |= (exponent - 15 + 127) << 23;
-	}
-
-	result |= mantissa << 13;
-
-	swapfloat.i = result;
-	return swapfloat.f;
-#endif
-}
-
-/*
- * Convert a float4 to a half
- */
-static inline half
-Float4ToHalfUnchecked(float num)
-{
-#if defined(F16C_SUPPORT)
-	return _cvtss_sh(num, 0);
-#elif defined(FLT16_SUPPORT)
-	return (_Float16) num;
-#else
-	/* TODO Improve performance */
-
-	/* Assumes same endianness for floats and integers */
-	union
-	{
-		float		f;
-		uint32		i;
-	}			swapfloat;
-
-	union
-	{
-		half		h;
-		uint16		i;
-	}			swaphalf;
-
-	uint32		bin;
-	int			exponent;
-	int			mantissa;
-	uint16		result;
-
-	swapfloat.f = num;
-	bin = swapfloat.i;
-	exponent = (bin & 0x7F800000) >> 23;
-	mantissa = bin & 0x007FFFFF;
-
-	/* Sign */
-	result = (bin & 0x80000000) >> 16;
-
-	if (isinf(num))
-	{
-		/* Infinite */
-		result |= 0x7C00;
-	}
-	else if (isnan(num))
-	{
-		/* NaN */
-		result |= 0x7E00;
-		result |= mantissa >> 13;
-	}
-	else if (exponent > 98)
-	{
-		int			m;
-		int			gr;
-		int			s;
-
-		exponent -= 127;
-		s = mantissa & 0x00000FFF;
-
-		/* Subnormal */
-		if (exponent < -14)
-		{
-			int			diff = -exponent - 14;
-
-			mantissa >>= diff;
-			mantissa += 1 << (23 - diff);
-			s |= mantissa & 0x00000FFF;
-		}
-
-		m = mantissa >> 13;
-
-		/* Round */
-		gr = (mantissa >> 12) % 4;
-		if (gr == 3 || (gr == 1 && s != 0))
-			m += 1;
-
-		if (m == 1024)
-		{
-			m = 0;
-			exponent += 1;
-		}
-
-		if (exponent > 15)
-		{
-			/* Infinite */
-			result |= 0x7C00;
-		}
-		else
-		{
-			if (exponent >= -14)
-				result |= (exponent + 15) << 10;
-
-			result |= m;
-		}
-	}
-
-	swaphalf.i = result;
-	return swaphalf.h;
-#endif
-}
-
-/*
- * Convert a float4 to a half
- */
-static inline half
-Float4ToHalf(float num)
-{
-	half		result = Float4ToHalfUnchecked(num);
-
-	if (unlikely(HalfIsInf(result)) && !isinf(num))
-	{
-		char	   *buf = palloc(FLOAT_SHORTEST_DECIMAL_LEN);
-
-		float_to_shortest_decimal_buf(num, buf);
-
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("\"%s\" is out of range for type halfvec", buf)));
-	}
-
-	return result;
-}
-
-#endif

src/halfvec.h

@@ -1,49 +0,0 @@
-#ifndef HALFVEC_H
-#define HALFVEC_H
-
-#define __STDC_WANT_IEC_60559_TYPES_EXT__
-
-#include <float.h>
-
-#include "bitutils.h"
-#include "fmgr.h"
-#include "vector.h"
-
-#if defined(USE_DISPATCH)
-#define HALFVEC_DISPATCH
-#endif
-
-/* F16C has better performance than _Float16 (on x86-64) */
-#if defined(__F16C__)
-#define F16C_SUPPORT
-#elif defined(__FLT16_MAX__) && !defined(HALFVEC_DISPATCH)
-#define FLT16_SUPPORT
-#endif
-
-#ifdef FLT16_SUPPORT
-#define half _Float16
-#define HALF_MAX FLT16_MAX
-#else
-#define half uint16
-#define HALF_MAX 65504
-#endif
-
-#define HALFVEC_MAX_DIM VECTOR_MAX_DIM
-
-#define HALFVEC_SIZE(_dim)		(offsetof(HalfVector, x) + sizeof(half)*(_dim))
-#define DatumGetHalfVector(x)	((HalfVector *) PG_DETOAST_DATUM(x))
-#define PG_GETARG_HALFVEC_P(x)	DatumGetHalfVector(PG_GETARG_DATUM(x))
-#define PG_RETURN_HALFVEC_P(x)	PG_RETURN_POINTER(x)
-
-typedef struct HalfVector
-{
-	int32		vl_len_;		/* varlena header (do not touch directly!) */
-	int16		dim;			/* number of dimensions */
-	int16		unused;
-	half		x[FLEXIBLE_ARRAY_MEMBER];
-}			HalfVector;
-
-HalfVector *InitHalfVector(int dim);
-int			halfvec_cmp_internal(HalfVector * a, HalfVector * b);
-
-#endif

src/hnsw.c

@@ -194,7 +194,7 @@ hnswhandler(PG_FUNCTION_ARGS)
 	IndexAmRoutine *amroutine = makeNode(IndexAmRoutine);
 
 	amroutine->amstrategies = 0;
-	amroutine->amsupport = 4;
+	amroutine->amsupport = 2;
 #if PG_VERSION_NUM >= 130000
 	amroutine->amoptsprocnum = 0;
 #endif

src/hnsw.h

@@ -17,13 +17,10 @@
 #endif
 
 #define HNSW_MAX_DIM 2000
-#define HNSW_MAX_NNZ 1000
 
 /* Support functions */
 #define HNSW_DISTANCE_PROC 1
 #define HNSW_NORM_PROC 2
-#define HNSW_NORMALIZE_PROC 3
-#define HNSW_TYPE_SUPPORT_PROC 4
 
 #define HNSW_VERSION	1
 #define HNSW_MAGIC_NUMBER 0xA953A953
@@ -61,10 +58,7 @@
 typedef enum HnswType
 {
 	HNSW_TYPE_VECTOR,
-	HNSW_TYPE_HALFVEC,
+	HNSW_TYPE_BIT
-	HNSW_TYPE_BIT,
-	HNSW_TYPE_SPARSEVEC,
-	HNSW_TYPE_UNSUPPORTED
 }			HnswType;
 
 /* Build phases */
@@ -268,7 +262,6 @@ typedef struct HnswBuildState
 	/* Support functions */
 	FmgrInfo   *procinfo;
 	FmgrInfo   *normprocinfo;
-	FmgrInfo   *normalizeprocinfo;
 	Oid			collation;
 
 	/* Variables */
@@ -345,7 +338,6 @@ typedef struct HnswScanOpaqueData
 	/* Support functions */
 	FmgrInfo   *procinfo;
 	FmgrInfo   *normprocinfo;
-	FmgrInfo   *normalizeprocinfo;
 	Oid			collation;
 }			HnswScanOpaqueData;
 
@@ -382,9 +374,7 @@ int			HnswGetM(Relation index);
 int			HnswGetEfConstruction(Relation index);
 FmgrInfo   *HnswOptionalProcInfo(Relation index, uint16 procnum);
 HnswType	HnswGetType(Relation index);
-Datum		HnswNormValue(FmgrInfo *procinfo, Oid collation, Datum value);
+bool		HnswNormValue(FmgrInfo *procinfo, Oid collation, Datum *value, HnswType type);
-bool		HnswCheckNorm(FmgrInfo *procinfo, Oid collation, Datum value);
-void		HnswCheckValue(Datum value, HnswType type);
 Buffer		HnswNewBuffer(Relation index, ForkNumber forkNum);
 void		HnswInitPage(Buffer buf, Page page);
 void		HnswInit(void);

src/hnswbuild.c

@@ -487,16 +487,11 @@ InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heaptid, Hn
 	/* Detoast once for all calls */
 	Datum		value = PointerGetDatum(PG_DETOAST_DATUM(values[0]));
 
-	/* Check value */
-	HnswCheckValue(value, buildstate->type);
-
 	/* Normalize if needed */
 	if (buildstate->normprocinfo != NULL)
 	{
-		if (!HnswCheckNorm(buildstate->normprocinfo, buildstate->collation, value))
+		if (!HnswNormValue(buildstate->normprocinfo, buildstate->collation, &value, buildstate->type))
 			return false;
-
-		value = HnswNormValue(buildstate->normalizeprocinfo, buildstate->collation, value);
 	}
 
 	/* Get datum size */
@@ -679,12 +674,8 @@ GetMaxDimensions(HnswType type)
 {
 	int			maxDimensions = HNSW_MAX_DIM;
 
-	if (type == HNSW_TYPE_HALFVEC)
+	if (type == HNSW_TYPE_BIT)
-		maxDimensions *= 2;
-	else if (type == HNSW_TYPE_BIT)
 		maxDimensions *= 32;
-	else if (type == HNSW_TYPE_SPARSEVEC)
-		maxDimensions = INT_MAX;
 
 	return maxDimensions;
 }
@@ -725,7 +716,6 @@ InitBuildState(HnswBuildState * buildstate, Relation heap, Relation index, Index
 	/* Get support functions */
 	buildstate->procinfo = index_getprocinfo(index, 1, HNSW_DISTANCE_PROC);
 	buildstate->normprocinfo = HnswOptionalProcInfo(index, HNSW_NORM_PROC);
-	buildstate->normalizeprocinfo = HnswOptionalProcInfo(index, HNSW_NORMALIZE_PROC);
 	buildstate->collation = index->rd_indcollation[0];
 
 	InitGraph(&buildstate->graphData, NULL, maintenance_work_mem * 1024L);

src/hnswinsert.c

@@ -618,17 +618,12 @@ HnswInsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_ti
 	/* Detoast once for all calls */
 	value = PointerGetDatum(PG_DETOAST_DATUM(values[0]));
 
-	/* Check value */
-	HnswCheckValue(value, HnswGetType(index));
-
 	/* Normalize if needed */
 	normprocinfo = HnswOptionalProcInfo(index, HNSW_NORM_PROC);
 	if (normprocinfo != NULL)
 	{
-		if (!HnswCheckNorm(normprocinfo, collation, value))
+		if (!HnswNormValue(normprocinfo, collation, &value, HnswGetType(index)))
 			return;
-
-		value = HnswNormValue(HnswOptionalProcInfo(index, HNSW_NORMALIZE_PROC), collation, value);
 	}
 
 	HnswInsertTupleOnDisk(index, value, values, isnull, heap_tid, false);

src/hnswscan.c

@@ -1,6 +1,8 @@
 #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"
@@ -61,7 +63,7 @@ GetScanValue(IndexScanDesc scan)
 
 		/* Fine if normalization fails */
 		if (so->normprocinfo != NULL)
-			value = HnswNormValue(so->normalizeprocinfo, so->collation, value);
+			HnswNormValue(so->normprocinfo, so->collation, &value, HnswGetType(scan->indexRelation));
 	}
 
 	return value;
@@ -87,7 +89,6 @@ hnswbeginscan(Relation index, int nkeys, int norderbys)
 	/* Set support functions */
 	so->procinfo = index_getprocinfo(index, 1, HNSW_DISTANCE_PROC);
 	so->normprocinfo = HnswOptionalProcInfo(index, HNSW_NORM_PROC);
-	so->normalizeprocinfo = HnswOptionalProcInfo(index, HNSW_NORMALIZE_PROC);
 	so->collation = index->rd_indcollation[0];
 
 	scan->opaque = so;
@@ -159,10 +160,6 @@ hnswgettuple(IndexScanDesc scan, ScanDirection dir)
 		UnlockPage(scan->indexRelation, HNSW_SCAN_LOCK, ShareLock);
 
 		so->first = false;
-
-#if defined(HNSW_MEMORY) && PG_VERSION_NUM >= 130000
-		elog(INFO, "memory: %zu MB", MemoryContextMemAllocated(so->tmpCtx, false) / (1024 * 1024));
-#endif
 	}
 
 	while (list_length(so->w) > 0)

src/hnswutils.c

@@ -3,16 +3,14 @@
 #include <math.h>
 
 #include "access/generic_xlog.h"
-#include "catalog/pg_type.h"
 #include "catalog/pg_type_d.h"
-#include "fmgr.h"
 #include "hnsw.h"
 #include "lib/pairingheap.h"
-#include "sparsevec.h"
 #include "storage/bufmgr.h"
 #include "utils/datum.h"
 #include "utils/memdebug.h"
 #include "utils/rel.h"
+#include "vector.h"
 
 #if PG_VERSION_NUM >= 130000
 #include "common/hashfn.h"
@@ -158,55 +156,47 @@ HnswOptionalProcInfo(Relation index, uint16 procnum)
 HnswType
 HnswGetType(Relation index)
 {
-	FmgrInfo   *procinfo = HnswOptionalProcInfo(index, HNSW_TYPE_SUPPORT_PROC);
 	Oid			typid = TupleDescAttr(index->rd_att, 0)->atttypid;
-	HnswType	result;
 
-	if (procinfo == NULL)
+	if (typid == BITOID || typid == VARBITOID)
-		return HNSW_TYPE_VECTOR;
+		return HNSW_TYPE_BIT;
 
-	result = (HnswType) DatumGetInt32(FunctionCall1(procinfo, ObjectIdGetDatum(typid)));
+	return HNSW_TYPE_VECTOR;
-
-	if (result == HNSW_TYPE_UNSUPPORTED)
-		elog(ERROR, "type not supported for hnsw index");
-
-	return result;
 }
 
 /*
- * Normalize value
+ * Divide by the norm
- */
+ *
-Datum
+ * Returns false if value should not be indexed
-HnswNormValue(FmgrInfo *procinfo, Oid collation, Datum value)
+ *
-{
+ * The caller needs to free the pointer stored in value
-	if (procinfo == NULL)
+ * if it's different than the original value
-		return DirectFunctionCall1(l2_normalize, value);
-
-	return FunctionCall1Coll(procinfo, collation, value);
-}
-
-/*
- * Check if non-zero norm
  */
 bool
-HnswCheckNorm(FmgrInfo *procinfo, Oid collation, Datum value)
+HnswNormValue(FmgrInfo *procinfo, Oid collation, Datum *value, HnswType type)
 {
-	return DatumGetFloat8(FunctionCall1Coll(procinfo, collation, value)) > 0;
+	double		norm = DatumGetFloat8(FunctionCall1Coll(procinfo, collation, *value));
-}
 
-/*
+	if (norm > 0)
- * Check if a value can be indexed
- */
-void
-HnswCheckValue(Datum value, HnswType type)
-{
-	if (type == HNSW_TYPE_SPARSEVEC)
 	{
-		SparseVector *vec = DatumGetSparseVector(value);
+		/* TODO Remove vector-specific code */
+		if (type == HNSW_TYPE_VECTOR)
+		{
+			Vector	   *v = DatumGetVector(*value);
+			Vector	   *result = InitVector(v->dim);
 
-		if (vec->nnz > HNSW_MAX_NNZ)
+			for (int i = 0; i < v->dim; i++)
-			elog(ERROR, "sparsevec cannot have more than %d non-zero elements for hnsw index", HNSW_MAX_NNZ);
+				result->x[i] = v->x[i] / norm;
+
+			*value = PointerGetDatum(result);
+		}
+		else
+			elog(ERROR, "Unsupported type");
+
+		return true;
 	}
+
+	return false;
 }
 
 /*
@@ -1302,29 +1292,3 @@ HnswFindElementNeighbors(char *base, HnswElement element, HnswElement entryPoint
 		ep = w;
 	}
 }
-
-PGDLLEXPORT PG_FUNCTION_INFO_V1(halfvec_hnsw_support);
-Datum
-halfvec_hnsw_support(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_INT32(HNSW_TYPE_HALFVEC);
-};
-
-PGDLLEXPORT PG_FUNCTION_INFO_V1(bit_hnsw_support);
-Datum
-bit_hnsw_support(PG_FUNCTION_ARGS)
-{
-	Oid			typid = PG_GETARG_OID(0);
-
-	if (typid == BITOID)
-		PG_RETURN_INT32(HNSW_TYPE_BIT);
-	else
-		PG_RETURN_INT32(HNSW_TYPE_UNSUPPORTED);
-};
-
-PGDLLEXPORT PG_FUNCTION_INFO_V1(sparsevec_hnsw_support);
-Datum
-sparsevec_hnsw_support(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_INT32(HNSW_TYPE_SPARSEVEC);
-};

src/ivfbuild.c

@@ -6,19 +6,16 @@
 #include "access/tableam.h"
 #include "access/parallel.h"
 #include "access/xact.h"
-#include "bitvec.h"
 #include "catalog/index.h"
 #include "catalog/pg_operator_d.h"
 #include "catalog/pg_type_d.h"
 #include "commands/progress.h"
-#include "halfvec.h"
 #include "ivfflat.h"
 #include "miscadmin.h"
 #include "optimizer/optimizer.h"
 #include "storage/bufmgr.h"
 #include "tcop/tcopprot.h"
 #include "utils/memutils.h"
-#include "vector.h"
 
 #if PG_VERSION_NUM >= 140000
 #include "utils/backend_progress.h"
@@ -60,15 +57,13 @@ AddSample(Datum *values, IvfflatBuildState * buildstate)
 	 */
 	if (buildstate->kmeansnormprocinfo != NULL)
 	{
-		if (!IvfflatCheckNorm(buildstate->kmeansnormprocinfo, buildstate->collation, value))
+		if (!IvfflatNormValue(buildstate->kmeansnormprocinfo, buildstate->collation, &value))
 			return;
-
-		value = IvfflatNormValue(buildstate->normalizeprocinfo, buildstate->collation, value);
 	}
 
 	if (samples->length < targsamples)
 	{
-		VectorArraySet(samples, samples->length, DatumGetPointer(value));
+		VectorArraySet(samples, samples->length, DatumGetVector(value));
 		samples->length++;
 	}
 	else
@@ -85,7 +80,7 @@ AddSample(Datum *values, IvfflatBuildState * buildstate)
 #endif
 
 			Assert(k >= 0 && k < targsamples);
-			VectorArraySet(samples, k, DatumGetPointer(value));
+			VectorArraySet(samples, k, DatumGetVector(value));
 		}
 
 		buildstate->rowstoskip -= 1;
@@ -158,10 +153,8 @@ AddTupleToSort(Relation index, ItemPointer tid, Datum *values, IvfflatBuildState
 	/* Normalize if needed */
 	if (buildstate->normprocinfo != NULL)
 	{
-		if (!IvfflatCheckNorm(buildstate->normprocinfo, buildstate->collation, value))
+		if (!IvfflatNormValue(buildstate->normprocinfo, buildstate->collation, &value))
 			return;
-
-		value = IvfflatNormValue(buildstate->normalizeprocinfo, buildstate->collation, value);
 	}
 
 	/* Find the list that minimizes the distance */
@@ -319,62 +312,25 @@ InsertTuples(Relation index, IvfflatBuildState * buildstate, ForkNumber forkNum)
 	}
 }
 
-/*
- * Get max dimensions
- */
-static int
-GetMaxDimensions(IvfflatType type)
-{
-	int			maxDimensions = IVFFLAT_MAX_DIM;
-
-	if (type == IVFFLAT_TYPE_HALFVEC)
-		maxDimensions *= 2;
-	else if (type == IVFFLAT_TYPE_BIT)
-		maxDimensions *= 32;
-
-	return maxDimensions;
-}
-
-/*
- * Get item size
- */
-static Size
-GetItemSize(IvfflatType type, int dimensions)
-{
-	if (type == IVFFLAT_TYPE_VECTOR)
-		return VECTOR_SIZE(dimensions);
-	else if (type == IVFFLAT_TYPE_HALFVEC)
-		return HALFVEC_SIZE(dimensions);
-	else if (type == IVFFLAT_TYPE_BIT)
-		return VARBITTOTALLEN(dimensions);
-	else
-		elog(ERROR, "Unsupported type");
-}
-
 /*
  * Initialize the build state
  */
 static void
 InitBuildState(IvfflatBuildState * buildstate, Relation heap, Relation index, IndexInfo *indexInfo)
 {
-	int			maxDimensions;
-
 	buildstate->heap = heap;
 	buildstate->index = index;
 	buildstate->indexInfo = indexInfo;
-	buildstate->type = IvfflatGetType(index);
 
 	buildstate->lists = IvfflatGetLists(index);
 	buildstate->dimensions = TupleDescAttr(index->rd_att, 0)->atttypmod;
 
-	maxDimensions = GetMaxDimensions(buildstate->type);
-
 	/* Require column to have dimensions to be indexed */
 	if (buildstate->dimensions < 0)
 		elog(ERROR, "column does not have dimensions");
 
-	if (buildstate->dimensions > maxDimensions)
+	if (buildstate->dimensions > IVFFLAT_MAX_DIM)
-		elog(ERROR, "column cannot have more than %d dimensions for ivfflat index", maxDimensions);
+		elog(ERROR, "column cannot have more than %d dimensions for ivfflat index", IVFFLAT_MAX_DIM);
 
 	buildstate->reltuples = 0;
 	buildstate->indtuples = 0;
@@ -383,7 +339,6 @@ InitBuildState(IvfflatBuildState * buildstate, Relation heap, Relation index, In
 	buildstate->procinfo = index_getprocinfo(index, 1, IVFFLAT_DISTANCE_PROC);
 	buildstate->normprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_NORM_PROC);
 	buildstate->kmeansnormprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_KMEANS_NORM_PROC);
-	buildstate->normalizeprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_NORMALIZE_PROC);
 	buildstate->collation = index->rd_indcollation[0];
 
 	/* Require more than one dimension for spherical k-means */
@@ -398,7 +353,7 @@ InitBuildState(IvfflatBuildState * buildstate, Relation heap, Relation index, In
 
 	buildstate->slot = MakeSingleTupleTableSlot(buildstate->tupdesc, &TTSOpsVirtual);
 
-	buildstate->centers = VectorArrayInit(buildstate->lists, buildstate->dimensions, GetItemSize(buildstate->type, buildstate->dimensions));
+	buildstate->centers = VectorArrayInit(buildstate->lists, buildstate->dimensions);
 	buildstate->listInfo = palloc(sizeof(ListInfo) * buildstate->lists);
 
 	buildstate->tmpCtx = AllocSetContextCreate(CurrentMemoryContext,
@@ -453,7 +408,7 @@ ComputeCenters(IvfflatBuildState * buildstate)
 
 	/* Sample rows */
 	/* TODO Ensure within maintenance_work_mem */
-	buildstate->samples = VectorArrayInit(numSamples, buildstate->dimensions, buildstate->centers->itemsize);
+	buildstate->samples = VectorArrayInit(numSamples, buildstate->dimensions);
 	if (buildstate->heap != NULL)
 	{
 		SampleRows(buildstate);
@@ -468,7 +423,7 @@ ComputeCenters(IvfflatBuildState * buildstate)
 	}
 
 	/* Calculate centers */
-	IvfflatBench("k-means", IvfflatKmeans(buildstate->index, buildstate->samples, buildstate->centers, buildstate->type));
+	IvfflatBench("k-means", IvfflatKmeans(buildstate->index, buildstate->samples, buildstate->centers));
 
 	/* Free samples before we allocate more memory */
 	VectorArrayFree(buildstate->samples);
@@ -513,7 +468,7 @@ CreateListPages(Relation index, VectorArray centers, int dimensions,
 	Size		listSize;
 	IvfflatList list;
 
-	listSize = MAXALIGN(IVFFLAT_LIST_SIZE(centers->itemsize));
+	listSize = MAXALIGN(IVFFLAT_LIST_SIZE(dimensions));
 	list = palloc0(listSize);
 
 	buf = IvfflatNewBuffer(index, forkNum);
@@ -526,7 +481,7 @@ CreateListPages(Relation index, VectorArray centers, int dimensions,
 		/* Load list */
 		list->startPage = InvalidBlockNumber;
 		list->insertPage = InvalidBlockNumber;
-		memcpy(&list->center, VectorArrayGet(centers, i), centers->itemsize);
+		memcpy(&list->center, VectorArrayGet(centers, i), VECTOR_SIZE(dimensions));
 
 		/* Ensure free space */
 		if (PageGetFreeSpace(page) < listSize)
@@ -631,7 +586,7 @@ ParallelHeapScan(IvfflatBuildState * buildstate)
  * Perform a worker's portion of a parallel sort
  */
 static void
-IvfflatParallelScanAndSort(IvfflatSpool * ivfspool, IvfflatShared * ivfshared, Sharedsort *sharedsort, char *ivfcenters, int sortmem, bool progress)
+IvfflatParallelScanAndSort(IvfflatSpool * ivfspool, IvfflatShared * ivfshared, Sharedsort *sharedsort, Vector * ivfcenters, int sortmem, bool progress)
 {
 	SortCoordinate coordinate;
 	IvfflatBuildState buildstate;
@@ -655,7 +610,7 @@ IvfflatParallelScanAndSort(IvfflatSpool * ivfspool, IvfflatShared * ivfshared, S
 	indexInfo = BuildIndexInfo(ivfspool->index);
 	indexInfo->ii_Concurrent = ivfshared->isconcurrent;
 	InitBuildState(&buildstate, ivfspool->heap, ivfspool->index, indexInfo);
-	memcpy(buildstate.centers->items, ivfcenters, buildstate.centers->itemsize * buildstate.centers->maxlen);
+	memcpy(buildstate.centers->items, ivfcenters, VECTOR_SIZE(buildstate.centers->dim) * buildstate.centers->maxlen);
 	buildstate.centers->length = buildstate.centers->maxlen;
 	ivfspool->sortstate = tuplesort_begin_heap(buildstate.tupdesc, 1, attNums, sortOperators, sortCollations, nullsFirstFlags, sortmem, coordinate, false);
 	buildstate.sortstate = ivfspool->sortstate;
@@ -703,7 +658,7 @@ IvfflatParallelBuildMain(dsm_segment *seg, shm_toc *toc)
 	IvfflatSpool *ivfspool;
 	IvfflatShared *ivfshared;
 	Sharedsort *sharedsort;
-	char	   *ivfcenters;
+	Vector	   *ivfcenters;
 	Relation	heapRel;
 	Relation	indexRel;
 	LOCKMODE	heapLockmode;
@@ -817,7 +772,7 @@ IvfflatBeginParallel(IvfflatBuildState * buildstate, bool isconcurrent, int requ
 	Size		estcenters;
 	IvfflatShared *ivfshared;
 	Sharedsort *sharedsort;
-	char	   *ivfcenters;
+	Vector	   *ivfcenters;
 	IvfflatLeader *ivfleader = (IvfflatLeader *) palloc0(sizeof(IvfflatLeader));
 	bool		leaderparticipates = true;
 	int			querylen;
@@ -844,7 +799,7 @@ IvfflatBeginParallel(IvfflatBuildState * buildstate, bool isconcurrent, int requ
 	shm_toc_estimate_chunk(&pcxt->estimator, estivfshared);
 	estsort = tuplesort_estimate_shared(scantuplesortstates);
 	shm_toc_estimate_chunk(&pcxt->estimator, estsort);
-	estcenters = buildstate->centers->itemsize * buildstate->centers->maxlen;
+	estcenters = VECTOR_SIZE(buildstate->dimensions) * buildstate->lists;
 	shm_toc_estimate_chunk(&pcxt->estimator, estcenters);
 	shm_toc_estimate_keys(&pcxt->estimator, 3);
 
@@ -896,7 +851,7 @@ IvfflatBeginParallel(IvfflatBuildState * buildstate, bool isconcurrent, int requ
 	tuplesort_initialize_shared(sharedsort, scantuplesortstates,
 								pcxt->seg);
 
-	ivfcenters = shm_toc_allocate(pcxt->toc, estcenters);
+	ivfcenters = (Vector *) shm_toc_allocate(pcxt->toc, estcenters);
 	memcpy(ivfcenters, buildstate->centers->items, estcenters);
 
 	shm_toc_insert(pcxt->toc, PARALLEL_KEY_IVFFLAT_SHARED, ivfshared);

src/ivfflat.c

@@ -188,7 +188,7 @@ ivfflathandler(PG_FUNCTION_ARGS)
 	IndexAmRoutine *amroutine = makeNode(IndexAmRoutine);
 
 	amroutine->amstrategies = 0;
-	amroutine->amsupport = 6;
+	amroutine->amsupport = 4;
 #if PG_VERSION_NUM >= 130000
 	amroutine->amoptsprocnum = 0;
 #endif

src/ivfflat.h

@@ -28,8 +28,6 @@
 #define IVFFLAT_NORM_PROC 2
 #define IVFFLAT_KMEANS_DISTANCE_PROC 3
 #define IVFFLAT_KMEANS_NORM_PROC 4
-#define IVFFLAT_NORMALIZE_PROC 5
-#define IVFFLAT_TYPE_SUPPORT_PROC 6
 
 #define IVFFLAT_VERSION	1
 #define IVFFLAT_MAGIC_NUMBER 0x14FF1A7
@@ -45,21 +43,13 @@
 #define IVFFLAT_MAX_LISTS		32768
 #define IVFFLAT_DEFAULT_PROBES	1
 
-typedef enum IvfflatType
-{
-	IVFFLAT_TYPE_VECTOR,
-	IVFFLAT_TYPE_HALFVEC,
-	IVFFLAT_TYPE_BIT,
-	IVFFLAT_TYPE_UNSUPPORTED
-}			IvfflatType;
-
 /* Build phases */
 /* PROGRESS_CREATEIDX_SUBPHASE_INITIALIZE is 1 */
 #define PROGRESS_IVFFLAT_PHASE_KMEANS	2
 #define PROGRESS_IVFFLAT_PHASE_ASSIGN	3
 #define PROGRESS_IVFFLAT_PHASE_LOAD		4
 
-#define IVFFLAT_LIST_SIZE(size)	(offsetof(IvfflatListData, center) + size)
+#define IVFFLAT_LIST_SIZE(_dim)	(offsetof(IvfflatListData, center) + VECTOR_SIZE(_dim))
 
 #define IvfflatPageGetOpaque(page)	((IvfflatPageOpaque) PageGetSpecialPointer(page))
 #define IvfflatPageGetMeta(page)	((IvfflatMetaPageData *) PageGetContents(page))
@@ -95,8 +85,7 @@ typedef struct VectorArrayData
 	int			length;
 	int			maxlen;
 	int			dim;
-	Size		itemsize;
+	Vector	   *items;
-	char	   *items;
 }			VectorArrayData;
 
 typedef VectorArrayData * VectorArray;
@@ -155,7 +144,7 @@ typedef struct IvfflatLeader
 	IvfflatShared *ivfshared;
 	Sharedsort *sharedsort;
 	Snapshot	snapshot;
-	char	   *ivfcenters;
+	Vector	   *ivfcenters;
 }			IvfflatLeader;
 
 typedef struct IvfflatBuildState
@@ -164,7 +153,6 @@ typedef struct IvfflatBuildState
 	Relation	heap;
 	Relation	index;
 	IndexInfo  *indexInfo;
-	IvfflatType type;
 
 	/* Settings */
 	int			dimensions;
@@ -178,7 +166,6 @@ typedef struct IvfflatBuildState
 	FmgrInfo   *procinfo;
 	FmgrInfo   *normprocinfo;
 	FmgrInfo   *kmeansnormprocinfo;
-	FmgrInfo   *normalizeprocinfo;
 	Oid			collation;
 
 	/* Variables */
@@ -259,9 +246,7 @@ typedef struct IvfflatScanOpaqueData
 	/* Support functions */
 	FmgrInfo   *procinfo;
 	FmgrInfo   *normprocinfo;
-	FmgrInfo   *normalizeprocinfo;
 	Oid			collation;
-	Datum		(*distfunc) (FmgrInfo *flinfo, Oid collation, Datum arg1, Datum arg2);
 
 	/* Lists */
 	pairingheap *listQueue;
@@ -270,19 +255,18 @@ typedef struct IvfflatScanOpaqueData
 
 typedef IvfflatScanOpaqueData * IvfflatScanOpaque;
 
-#define VECTOR_ARRAY_SIZE(_length, _size) (sizeof(VectorArrayData) + (_length) * MAXALIGN(_size))
+#define VECTOR_ARRAY_SIZE(_length, _dim) (sizeof(VectorArrayData) + (_length) * VECTOR_SIZE(_dim))
-#define VECTOR_ARRAY_OFFSET(_arr, _offset) ((char*) (_arr)->items + (_offset) * (_arr)->itemsize)
+#define VECTOR_ARRAY_OFFSET(_arr, _offset) ((char*) (_arr)->items + (_offset) * VECTOR_SIZE((_arr)->dim))
-#define VectorArrayGet(_arr, _offset) VECTOR_ARRAY_OFFSET(_arr, _offset)
+#define VectorArrayGet(_arr, _offset) ((Vector *) VECTOR_ARRAY_OFFSET(_arr, _offset))
-#define VectorArraySet(_arr, _offset, _val) memcpy(VECTOR_ARRAY_OFFSET(_arr, _offset), _val, (_arr)->itemsize)
+#define VectorArraySet(_arr, _offset, _val) memcpy(VECTOR_ARRAY_OFFSET(_arr, _offset), _val, VECTOR_SIZE((_arr)->dim))
 
 /* Methods */
-VectorArray VectorArrayInit(int maxlen, int dimensions, Size itemsize);
+VectorArray VectorArrayInit(int maxlen, int dimensions);
 void		VectorArrayFree(VectorArray arr);
-void		IvfflatKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatType type);
+void		PrintVectorArray(char *msg, VectorArray arr);
+void		IvfflatKmeans(Relation index, VectorArray samples, VectorArray centers);
 FmgrInfo   *IvfflatOptionalProcInfo(Relation index, uint16 procnum);
-IvfflatType IvfflatGetType(Relation index);
+bool		IvfflatNormValue(FmgrInfo *procinfo, Oid collation, Datum *value);
-Datum		IvfflatNormValue(FmgrInfo *procinfo, Oid collation, Datum value);
-bool		IvfflatCheckNorm(FmgrInfo *procinfo, Oid collation, Datum value);
 int			IvfflatGetLists(Relation index);
 void		IvfflatGetMetaPageInfo(Relation index, int *lists, int *dimensions);
 void		IvfflatUpdateList(Relation index, ListInfo listInfo, BlockNumber insertPage, BlockNumber originalInsertPage, BlockNumber startPage, ForkNumber forkNum);

src/ivfinsert.c

@@ -85,12 +85,8 @@ InsertTuple(Relation index, Datum *values, bool *isnull, ItemPointer heap_tid, R
 	normprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_NORM_PROC);
 	if (normprocinfo != NULL)
 	{
-		Oid			collation = index->rd_indcollation[0];
+		if (!IvfflatNormValue(normprocinfo, index->rd_indcollation[0], &value))
-
-		if (!IvfflatCheckNorm(normprocinfo, collation, value))
 			return;
-
-		value = IvfflatNormValue(IvfflatOptionalProcInfo(index, IVFFLAT_NORMALIZE_PROC), collation, value);
 	}
 
 	/* Find the insert page - sets the page and list info */

src/ivfkmeans.c

@@ -3,15 +3,12 @@
 #include <float.h>
 #include <math.h>
 
-#include "bitvec.h"
-#include "halfutils.h"
-#include "halfvec.h"
 #include "ivfflat.h"
 #include "miscadmin.h"
-#include "utils/builtins.h"
+
-#include "utils/datum.h"
+#ifdef IVFFLAT_MEMORY
 #include "utils/memutils.h"
-#include "vector.h"
+#endif
 
 /*
  * Initialize with kmeans++
@@ -49,12 +46,12 @@ InitCenters(Relation index, VectorArray samples, VectorArray centers, float *low
 
 		for (j = 0; j < numSamples; j++)
 		{
-			Datum		vec = PointerGetDatum(VectorArrayGet(samples, j));
+			Vector	   *vec = VectorArrayGet(samples, j);
 			double		distance;
 
 			/* Only need to compute distance for new center */
 			/* TODO Use triangle inequality to reduce distance calculations */
-			distance = DatumGetFloat8(FunctionCall2Coll(procinfo, collation, vec, PointerGetDatum(VectorArrayGet(centers, i))));
+			distance = DatumGetFloat8(FunctionCall2Coll(procinfo, collation, PointerGetDatum(vec), PointerGetDatum(VectorArrayGet(centers, i))));
 
 			/* Set lower bound */
 			lowerBound[j * numCenters + i] = distance;
@@ -89,31 +86,19 @@ InitCenters(Relation index, VectorArray samples, VectorArray centers, float *low
 }
 
 /*
- * Norm centers
+ * Apply norm to vector
  */
-static void
+static inline void
-NormCenters(FmgrInfo *normalizeprocinfo, Oid collation, VectorArray centers)
+ApplyNorm(FmgrInfo *normprocinfo, Oid collation, Vector * vec)
 {
-	MemoryContext normCtx = AllocSetContextCreate(CurrentMemoryContext,
+	double		norm = DatumGetFloat8(FunctionCall1Coll(normprocinfo, collation, PointerGetDatum(vec)));
-												  "Ivfflat norm temporary context",
-												  ALLOCSET_DEFAULT_SIZES);
-	MemoryContext oldCtx = MemoryContextSwitchTo(normCtx);
 
-	for (int j = 0; j < centers->length; j++)
+	/* TODO Handle zero norm */
+	if (norm > 0)
 	{
-		Datum		center = PointerGetDatum(VectorArrayGet(centers, j));
+		for (int i = 0; i < vec->dim; i++)
-		Datum		newCenter = IvfflatNormValue(normalizeprocinfo, collation, center);
+			vec->x[i] /= norm;
-		Size		size = VARSIZE_ANY(DatumGetPointer(newCenter));
-
-		if (size > centers->itemsize)
-			elog(ERROR, "safety check failed");
-
-		memcpy(DatumGetPointer(center), DatumGetPointer(newCenter), size);
-		MemoryContextReset(normCtx);
 	}
-
-	MemoryContextSwitchTo(oldCtx);
-	MemoryContextDelete(normCtx);
 }
 
 /*
@@ -125,63 +110,27 @@ CompareVectors(const void *a, const void *b)
 	return vector_cmp_internal((Vector *) a, (Vector *) b);
 }
 
-/*
- * Compare half vectors
- */
-static int
-CompareHalfVectors(const void *a, const void *b)
-{
-	return halfvec_cmp_internal((HalfVector *) a, (HalfVector *) b);
-}
-
-/*
- * Compare bit vectors
- */
-static int
-CompareBitVectors(const void *a, const void *b)
-{
-	return DirectFunctionCall2(bitcmp, VarBitPGetDatum((VarBit *) a), VarBitPGetDatum((VarBit *) b));
-}
-
-/*
- * Sort vector array
- */
-static void
-SortVectorArray(VectorArray arr, IvfflatType type)
-{
-	if (type == IVFFLAT_TYPE_VECTOR)
-		qsort(arr->items, arr->length, arr->itemsize, CompareVectors);
-	else if (type == IVFFLAT_TYPE_HALFVEC)
-		qsort(arr->items, arr->length, arr->itemsize, CompareHalfVectors);
-	else if (type == IVFFLAT_TYPE_BIT)
-		qsort(arr->items, arr->length, arr->itemsize, CompareBitVectors);
-	else
-		elog(ERROR, "Unsupported type");
-}
-
 /*
  * Quick approach if we have little data
  */
 static void
-QuickCenters(Relation index, VectorArray samples, VectorArray centers, IvfflatType type)
+QuickCenters(Relation index, VectorArray samples, VectorArray centers)
 {
 	int			dimensions = centers->dim;
 	Oid			collation = index->rd_indcollation[0];
 	FmgrInfo   *normprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_KMEANS_NORM_PROC);
-	FmgrInfo   *normalizeprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_NORMALIZE_PROC);
 
 	/* Copy existing vectors while avoiding duplicates */
 	if (samples->length > 0)
 	{
-		SortVectorArray(samples, type);
+		qsort(samples->items, samples->length, VECTOR_SIZE(samples->dim), CompareVectors);
-
 		for (int i = 0; i < samples->length; i++)
 		{
-			Datum		vec = PointerGetDatum(VectorArrayGet(samples, i));
+			Vector	   *vec = VectorArrayGet(samples, i);
 
-			if (i == 0 || !datumIsEqual(vec, PointerGetDatum(VectorArrayGet(samples, i - 1)), false, -1))
+			if (i == 0 || CompareVectors(vec, VectorArrayGet(samples, i - 1)) != 0)
 			{
-				VectorArraySet(centers, centers->length, DatumGetPointer(vec));
+				VectorArraySet(centers, centers->length, vec);
 				centers->length++;
 			}
 		}
@@ -190,47 +139,20 @@ QuickCenters(Relation index, VectorArray samples, VectorArray centers, IvfflatTy
 	/* Fill remaining with random data */
 	while (centers->length < centers->maxlen)
 	{
-		Datum		center = PointerGetDatum(VectorArrayGet(centers, centers->length));
+		Vector	   *vec = VectorArrayGet(centers, centers->length);
 
-		if (type == IVFFLAT_TYPE_VECTOR)
+		SET_VARSIZE(vec, VECTOR_SIZE(dimensions));
-		{
+		vec->dim = dimensions;
-			Vector	   *vec = DatumGetVector(center);
 
-			SET_VARSIZE(vec, VECTOR_SIZE(dimensions));
+		for (int j = 0; j < dimensions; j++)
-			vec->dim = dimensions;
+			vec->x[j] = RandomDouble();
 
-			for (int j = 0; j < dimensions; j++)
+		/* Normalize if needed (only needed for random centers) */
-				vec->x[j] = RandomDouble();
+		if (normprocinfo != NULL)
-		}
+			ApplyNorm(normprocinfo, collation, vec);
-		else if (type == IVFFLAT_TYPE_HALFVEC)
-		{
-			HalfVector *vec = DatumGetHalfVector(center);
-
-			SET_VARSIZE(vec, HALFVEC_SIZE(dimensions));
-			vec->dim = dimensions;
-
-			for (int j = 0; j < dimensions; j++)
-				vec->x[j] = Float4ToHalfUnchecked((float) RandomDouble());
-		}
-		else if (type == IVFFLAT_TYPE_BIT)
-		{
-			VarBit	   *vec = DatumGetVarBitP(center);
-
-			SET_VARSIZE(vec, VARBITTOTALLEN(dimensions));
-			VARBITLEN(vec) = dimensions;
-
-			for (int j = 0; j < dimensions; j++)
-				VARBITS(vec)[j / dimensions] |= (RandomDouble() > 0.5 ? 1 : 0) << (7 - (j % 8));
-		}
-		else
-			elog(ERROR, "Unsupported type");
 
 		centers->length++;
 	}
-
-	/* Fine if existing vectors are normalized twice */
-	if (normprocinfo != NULL)
-		NormCenters(normalizeprocinfo, collation, centers);
 }
 
 #ifdef IVFFLAT_MEMORY
@@ -238,163 +160,18 @@ QuickCenters(Relation index, VectorArray samples, VectorArray centers, IvfflatTy
  * Show memory usage
  */
 static void
-ShowMemoryUsage(MemoryContext context, Size estimatedSize)
+ShowMemoryUsage(Size estimatedSize)
 {
 #if PG_VERSION_NUM >= 130000
 	elog(INFO, "total memory: %zu MB",
-		 MemoryContextMemAllocated(context, true) / (1024 * 1024));
+		 MemoryContextMemAllocated(CurrentMemoryContext, true) / (1024 * 1024));
 #else
-	MemoryContextStats(context);
+	MemoryContextStats(CurrentMemoryContext);
 #endif
 	elog(INFO, "estimated memory: %zu MB", estimatedSize / (1024 * 1024));
 }
 #endif
 
-/*
- * Sum centers
- */
-static void
-SumCenters(VectorArray samples, VectorArray aggCenters, int *closestCenters, IvfflatType type)
-{
-	int			dimensions = aggCenters->dim;
-	int			numSamples = samples->length;
-
-	if (type == IVFFLAT_TYPE_VECTOR)
-	{
-		for (int j = 0; j < numSamples; j++)
-		{
-			Vector	   *aggCenter = (Vector *) VectorArrayGet(aggCenters, closestCenters[j]);
-			Vector	   *vec = (Vector *) VectorArrayGet(samples, j);
-
-			for (int k = 0; k < dimensions; k++)
-				aggCenter->x[k] += vec->x[k];
-		}
-	}
-	else if (type == IVFFLAT_TYPE_HALFVEC)
-	{
-		for (int j = 0; j < numSamples; j++)
-		{
-			Vector	   *aggCenter = (Vector *) VectorArrayGet(aggCenters, closestCenters[j]);
-			HalfVector *vec = (HalfVector *) VectorArrayGet(samples, j);
-
-			for (int k = 0; k < dimensions; k++)
-				aggCenter->x[k] += HalfToFloat4(vec->x[k]);
-		}
-	}
-	else if (type == IVFFLAT_TYPE_BIT)
-	{
-		for (int j = 0; j < numSamples; j++)
-		{
-			Vector	   *aggCenter = (Vector *) VectorArrayGet(aggCenters, closestCenters[j]);
-			VarBit	   *vec = (VarBit *) VectorArrayGet(samples, j);
-
-			for (int k = 0; k < dimensions; k++)
-				aggCenter->x[k] += (float) (((VARBITS(vec)[k / 8]) >> (7 - (k % 8))) & 0x01);
-		}
-	}
-	else
-		elog(ERROR, "Unsupported type");
-}
-
-/*
- * Set new centers
- */
-static void
-SetNewCenters(VectorArray aggCenters, VectorArray newCenters, IvfflatType type)
-{
-	int			dimensions = aggCenters->dim;
-	int			numCenters = aggCenters->maxlen;
-
-	if (type == IVFFLAT_TYPE_HALFVEC)
-	{
-		for (int j = 0; j < numCenters; j++)
-		{
-			Vector	   *aggCenter = (Vector *) VectorArrayGet(aggCenters, j);
-			HalfVector *newCenter = (HalfVector *) VectorArrayGet(newCenters, j);
-
-			for (int k = 0; k < dimensions; k++)
-				newCenter->x[k] = Float4ToHalfUnchecked(aggCenter->x[k]);
-		}
-	}
-	else if (type == IVFFLAT_TYPE_BIT)
-	{
-		for (int j = 0; j < numCenters; j++)
-		{
-			Vector	   *aggCenter = (Vector *) VectorArrayGet(aggCenters, j);
-			VarBit	   *newCenter = (VarBit *) VectorArrayGet(newCenters, j);
-			unsigned char *nx = VARBITS(newCenter);
-
-			for (uint32 k = 0; k < VARBITBYTES(newCenter); k++)
-				nx[k] = 0;
-
-			for (int k = 0; k < dimensions; k++)
-				nx[k / 8] |= (aggCenter->x[k] > 0.5) << (7 - (k % 8));
-		}
-	}
-}
-
-/*
- * Compute new centers
- */
-static void
-ComputeNewCenters(VectorArray samples, VectorArray aggCenters, VectorArray newCenters, int *centerCounts, int *closestCenters, FmgrInfo *normprocinfo, FmgrInfo *normalizeprocinfo, Oid collation, IvfflatType type)
-{
-	int			dimensions = aggCenters->dim;
-	int			numCenters = aggCenters->maxlen;
-	int			numSamples = samples->length;
-
-	/* Reset sum and count */
-	for (int j = 0; j < numCenters; j++)
-	{
-		Vector	   *vec = (Vector *) VectorArrayGet(aggCenters, j);
-
-		for (int k = 0; k < dimensions; k++)
-			vec->x[k] = 0.0;
-
-		centerCounts[j] = 0;
-	}
-
-	/* Increment sum of closest center */
-	SumCenters(samples, aggCenters, closestCenters, type);
-
-	/* Increment count of closest center */
-	for (int j = 0; j < numSamples; j++)
-		centerCounts[closestCenters[j]] += 1;
-
-	/* Divide sum by count */
-	for (int j = 0; j < numCenters; j++)
-	{
-		Vector	   *vec = (Vector *) VectorArrayGet(aggCenters, j);
-
-		if (centerCounts[j] > 0)
-		{
-			/* Double avoids overflow, but requires more memory */
-			/* TODO Update bounds */
-			for (int k = 0; k < dimensions; k++)
-			{
-				if (isinf(vec->x[k]))
-					vec->x[k] = vec->x[k] > 0 ? FLT_MAX : -FLT_MAX;
-			}
-
-			for (int k = 0; k < dimensions; k++)
-				vec->x[k] /= centerCounts[j];
-		}
-		else
-		{
-			/* TODO Handle empty centers properly */
-			for (int k = 0; k < dimensions; k++)
-				vec->x[k] = RandomDouble();
-		}
-	}
-
-	/* Set new centers if different from agg centers */
-	SetNewCenters(aggCenters, newCenters, type);
-
-	/* Normalize if needed */
-	if (normprocinfo != NULL)
-		NormCenters(normalizeprocinfo, collation, newCenters);
-}
-
 /*
  * Use Elkan for performance. This requires distance function to satisfy triangle inequality.
  *
@@ -404,17 +181,19 @@ ComputeNewCenters(VectorArray samples, VectorArray aggCenters, VectorArray newCe
  * https://www.aaai.org/Papers/ICML/2003/ICML03-022.pdf
  */
 static void
-ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatType type)
+ElkanKmeans(Relation index, VectorArray samples, VectorArray centers)
 {
 	FmgrInfo   *procinfo;
 	FmgrInfo   *normprocinfo;
-	FmgrInfo   *normalizeprocinfo;
 	Oid			collation;
+	Vector	   *vec;
+	Vector	   *newCenter;
+	int64		j;
+	int64		k;
 	int			dimensions = centers->dim;
 	int			numCenters = centers->maxlen;
 	int			numSamples = samples->length;
 	VectorArray newCenters;
-	VectorArray aggCenters;
 	int		   *centerCounts;
 	int		   *closestCenters;
 	float	   *lowerBound;
@@ -422,14 +201,11 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatTyp
 	float	   *s;
 	float	   *halfcdist;
 	float	   *newcdist;
-	MemoryContext kmeansCtx;
-	MemoryContext oldCtx;
 
 	/* Calculate allocation sizes */
-	Size		samplesSize = VECTOR_ARRAY_SIZE(samples->maxlen, samples->itemsize);
+	Size		samplesSize = VECTOR_ARRAY_SIZE(samples->maxlen, samples->dim);
-	Size		centersSize = VECTOR_ARRAY_SIZE(centers->maxlen, centers->itemsize);
+	Size		centersSize = VECTOR_ARRAY_SIZE(centers->maxlen, centers->dim);
-	Size		newCentersSize = VECTOR_ARRAY_SIZE(numCenters, centers->itemsize);
+	Size		newCentersSize = VECTOR_ARRAY_SIZE(numCenters, dimensions);
-	Size		aggCentersSize = type == IVFFLAT_TYPE_VECTOR ? 0 : VECTOR_ARRAY_SIZE(numCenters, VECTOR_SIZE(dimensions));
 	Size		centerCountsSize = sizeof(int) * numCenters;
 	Size		closestCentersSize = sizeof(int) * numSamples;
 	Size		lowerBoundSize = sizeof(float) * numSamples * numCenters;
@@ -439,7 +215,7 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatTyp
 	Size		newcdistSize = sizeof(float) * numCenters;
 
 	/* Calculate total size */
-	Size		totalSize = samplesSize + centersSize + newCentersSize + aggCentersSize + centerCountsSize + closestCentersSize + lowerBoundSize + upperBoundSize + sSize + halfcdistSize + newcdistSize;
+	Size		totalSize = samplesSize + centersSize + newCentersSize + centerCountsSize + closestCentersSize + lowerBoundSize + upperBoundSize + sSize + halfcdistSize + newcdistSize;
 
 	/* Check memory requirements */
 	/* Add one to error message to ceil */
@@ -456,15 +232,8 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatTyp
 	/* Set support functions */
 	procinfo = index_getprocinfo(index, 1, IVFFLAT_KMEANS_DISTANCE_PROC);
 	normprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_KMEANS_NORM_PROC);
-	normalizeprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_NORMALIZE_PROC);
 	collation = index->rd_indcollation[0];
 
-	/* Use memory context */
-	kmeansCtx = AllocSetContextCreate(CurrentMemoryContext,
-									  "Ivfflat kmeans temporary context",
-									  ALLOCSET_DEFAULT_SIZES);
-	oldCtx = MemoryContextSwitchTo(kmeansCtx);
-
 	/* Allocate space */
 	/* Use float instead of double to save memory */
 	centerCounts = palloc(centerCountsSize);
@@ -475,66 +244,29 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatTyp
 	halfcdist = palloc_extended(halfcdistSize, MCXT_ALLOC_HUGE);
 	newcdist = palloc(newcdistSize);
 
-	aggCenters = VectorArrayInit(numCenters, dimensions, VECTOR_SIZE(dimensions));
+	newCenters = VectorArrayInit(numCenters, dimensions);
-	aggCenters->length = numCenters;
+	for (j = 0; j < numCenters; j++)
-
-	for (int j = 0; j < numCenters; j++)
 	{
-		Vector	   *vec = (Vector *) VectorArrayGet(aggCenters, j);
+		vec = VectorArrayGet(newCenters, j);
-
 		SET_VARSIZE(vec, VECTOR_SIZE(dimensions));
 		vec->dim = dimensions;
 	}
 
-	if (type == IVFFLAT_TYPE_VECTOR)
-	{
-		/* Use same centers to save memory */
-		newCenters = aggCenters;
-	}
-	else if (type == IVFFLAT_TYPE_HALFVEC)
-	{
-		newCenters = VectorArrayInit(numCenters, dimensions, centers->itemsize);
-		newCenters->length = numCenters;
-
-		for (int j = 0; j < numCenters; j++)
-		{
-			HalfVector *vec = (HalfVector *) VectorArrayGet(newCenters, j);
-
-			SET_VARSIZE(vec, HALFVEC_SIZE(dimensions));
-			vec->dim = dimensions;
-		}
-	}
-	else if (type == IVFFLAT_TYPE_BIT)
-	{
-		newCenters = VectorArrayInit(numCenters, dimensions, centers->itemsize);
-		newCenters->length = numCenters;
-
-		for (int j = 0; j < numCenters; j++)
-		{
-			VarBit	   *vec = (VarBit *) VectorArrayGet(newCenters, j);
-
-			SET_VARSIZE(vec, VARBITTOTALLEN(dimensions));
-			VARBITLEN(vec) = dimensions;
-		}
-	}
-	else
-		elog(ERROR, "Unsupported type");
-
 #ifdef IVFFLAT_MEMORY
-	ShowMemoryUsage(oldCtx, totalSize);
+	ShowMemoryUsage(totalSize);
 #endif
 
 	/* Pick initial centers */
 	InitCenters(index, samples, centers, lowerBound);
 
 	/* Assign each x to its closest initial center c(x) = argmin d(x,c) */
-	for (int64 j = 0; j < numSamples; j++)
+	for (j = 0; j < numSamples; j++)
 	{
 		float		minDistance = FLT_MAX;
 		int			closestCenter = 0;
 
 		/* Find closest center */
-		for (int64 k = 0; k < numCenters; k++)
+		for (k = 0; k < numCenters; k++)
 		{
 			/* TODO Use Lemma 1 in k-means++ initialization */
 			float		distance = lowerBound[j * numCenters + k];
@@ -560,13 +292,13 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatTyp
 		CHECK_FOR_INTERRUPTS();
 
 		/* Step 1: For all centers, compute distance */
-		for (int64 j = 0; j < numCenters; j++)
+		for (j = 0; j < numCenters; j++)
 		{
-			Datum		vec = PointerGetDatum(VectorArrayGet(centers, j));
+			vec = VectorArrayGet(centers, j);
 
-			for (int64 k = j + 1; k < numCenters; k++)
+			for (k = j + 1; k < numCenters; k++)
 			{
-				float		distance = 0.5 * DatumGetFloat8(FunctionCall2Coll(procinfo, collation, vec, PointerGetDatum(VectorArrayGet(centers, k))));
+				float		distance = 0.5 * DatumGetFloat8(FunctionCall2Coll(procinfo, collation, PointerGetDatum(vec), PointerGetDatum(VectorArrayGet(centers, k))));
 
 				halfcdist[j * numCenters + k] = distance;
 				halfcdist[k * numCenters + j] = distance;
@@ -574,11 +306,11 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatTyp
 		}
 
 		/* For all centers c, compute s(c) */
-		for (int64 j = 0; j < numCenters; j++)
+		for (j = 0; j < numCenters; j++)
 		{
 			float		minDistance = FLT_MAX;
 
-			for (int64 k = 0; k < numCenters; k++)
+			for (k = 0; k < numCenters; k++)
 			{
 				float		distance;
 
@@ -595,7 +327,7 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatTyp
 
 		rjreset = iteration != 0;
 
-		for (int64 j = 0; j < numSamples; j++)
+		for (j = 0; j < numSamples; j++)
 		{
 			bool		rj;
 
@@ -605,9 +337,8 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatTyp
 
 			rj = rjreset;
 
-			for (int64 k = 0; k < numCenters; k++)
+			for (k = 0; k < numCenters; k++)
 			{
-				Datum		vec;
 				float		dxcx;
 
 				/* Step 3: For all remaining points x and centers c */
@@ -620,12 +351,12 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatTyp
 				if (upperBound[j] <= halfcdist[closestCenters[j] * numCenters + k])
 					continue;
 
-				vec = PointerGetDatum(VectorArrayGet(samples, j));
+				vec = VectorArrayGet(samples, j);
 
 				/* Step 3a */
 				if (rj)
 				{
-					dxcx = DatumGetFloat8(FunctionCall2Coll(procinfo, collation, vec, PointerGetDatum(VectorArrayGet(centers, closestCenters[j]))));
+					dxcx = DatumGetFloat8(FunctionCall2Coll(procinfo, collation, PointerGetDatum(vec), PointerGetDatum(VectorArrayGet(centers, closestCenters[j]))));
 
 					/* d(x,c(x)) computed, which is a form of d(x,c) */
 					lowerBound[j * numCenters + closestCenters[j]] = dxcx;
@@ -639,7 +370,7 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatTyp
 				/* Step 3b */
 				if (dxcx > lowerBound[j * numCenters + k] || dxcx > halfcdist[closestCenters[j] * numCenters + k])
 				{
-					float		dxc = DatumGetFloat8(FunctionCall2Coll(procinfo, collation, vec, PointerGetDatum(VectorArrayGet(centers, k))));
+					float		dxc = DatumGetFloat8(FunctionCall2Coll(procinfo, collation, PointerGetDatum(vec), PointerGetDatum(VectorArrayGet(centers, k))));
 
 					/* d(x,c) calculated */
 					lowerBound[j * numCenters + k] = dxc;
@@ -658,15 +389,66 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatTyp
 		}
 
 		/* Step 4: For each center c, let m(c) be mean of all points assigned */
-		ComputeNewCenters(samples, aggCenters, newCenters, centerCounts, closestCenters, normprocinfo, normalizeprocinfo, collation, type);
+		for (j = 0; j < numCenters; j++)
+		{
+			vec = VectorArrayGet(newCenters, j);
+			for (k = 0; k < dimensions; k++)
+				vec->x[k] = 0.0;
+
+			centerCounts[j] = 0;
+		}
+
+		for (j = 0; j < numSamples; j++)
+		{
+			int			closestCenter;
+
+			vec = VectorArrayGet(samples, j);
+			closestCenter = closestCenters[j];
+
+			/* Increment sum and count of closest center */
+			newCenter = VectorArrayGet(newCenters, closestCenter);
+			for (k = 0; k < dimensions; k++)
+				newCenter->x[k] += vec->x[k];
+
+			centerCounts[closestCenter] += 1;
+		}
+
+		for (j = 0; j < numCenters; j++)
+		{
+			vec = VectorArrayGet(newCenters, j);
+
+			if (centerCounts[j] > 0)
+			{
+				/* Double avoids overflow, but requires more memory */
+				/* TODO Update bounds */
+				for (k = 0; k < dimensions; k++)
+				{
+					if (isinf(vec->x[k]))
+						vec->x[k] = vec->x[k] > 0 ? FLT_MAX : -FLT_MAX;
+				}
+
+				for (k = 0; k < dimensions; k++)
+					vec->x[k] /= centerCounts[j];
+			}
+			else
+			{
+				/* TODO Handle empty centers properly */
+				for (k = 0; k < dimensions; k++)
+					vec->x[k] = RandomDouble();
+			}
+
+			/* Normalize if needed */
+			if (normprocinfo != NULL)
+				ApplyNorm(normprocinfo, collation, vec);
+		}
 
 		/* Step 5 */
-		for (int j = 0; j < numCenters; j++)
+		for (j = 0; j < numCenters; j++)
 			newcdist[j] = DatumGetFloat8(FunctionCall2Coll(procinfo, collation, PointerGetDatum(VectorArrayGet(centers, j)), PointerGetDatum(VectorArrayGet(newCenters, j))));
 
-		for (int64 j = 0; j < numSamples; j++)
+		for (j = 0; j < numSamples; j++)
 		{
-			for (int64 k = 0; k < numCenters; k++)
+			for (k = 0; k < numCenters; k++)
 			{
 				float		distance = lowerBound[j * numCenters + k] - newcdist[k];
 
@@ -679,26 +461,32 @@ ElkanKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatTyp
 
 		/* Step 6 */
 		/* We reset r(x) before Step 3 in the next iteration */
-		for (int j = 0; j < numSamples; j++)
+		for (j = 0; j < numSamples; j++)
 			upperBound[j] += newcdist[closestCenters[j]];
 
 		/* Step 7 */
-		for (int j = 0; j < numCenters; j++)
+		for (j = 0; j < numCenters; j++)
 			VectorArraySet(centers, j, VectorArrayGet(newCenters, j));
 
 		if (changes == 0 && iteration != 0)
 			break;
 	}
 
-	MemoryContextSwitchTo(oldCtx);
+	VectorArrayFree(newCenters);
-	MemoryContextDelete(kmeansCtx);
+	pfree(centerCounts);
+	pfree(closestCenters);
+	pfree(lowerBound);
+	pfree(upperBound);
+	pfree(s);
+	pfree(halfcdist);
+	pfree(newcdist);
 }
 
 /*
  * Detect issues with centers
  */
 static void
-CheckCenters(Relation index, VectorArray centers, IvfflatType type)
+CheckCenters(Relation index, VectorArray centers)
 {
 	FmgrInfo   *normprocinfo;
 
@@ -708,46 +496,25 @@ CheckCenters(Relation index, VectorArray centers, IvfflatType type)
 	/* Ensure no NaN or infinite values */
 	for (int i = 0; i < centers->length; i++)
 	{
-		if (type == IVFFLAT_TYPE_VECTOR)
+		Vector	   *vec = VectorArrayGet(centers, i);
+
+		for (int j = 0; j < vec->dim; j++)
 		{
-			Vector	   *vec = (Vector *) VectorArrayGet(centers, i);
+			if (isnan(vec->x[j]))
+				elog(ERROR, "NaN detected. Please report a bug.");
 
-			for (int j = 0; j < vec->dim; j++)
+			if (isinf(vec->x[j]))
-			{
+				elog(ERROR, "Infinite value detected. Please report a bug.");
-				if (isnan(vec->x[j]))
-					elog(ERROR, "NaN detected. Please report a bug.");
-
-				if (isinf(vec->x[j]))
-					elog(ERROR, "Infinite value detected. Please report a bug.");
-			}
 		}
-		else if (type == IVFFLAT_TYPE_HALFVEC)
-		{
-			HalfVector *vec = (HalfVector *) VectorArrayGet(centers, i);
-
-			for (int j = 0; j < vec->dim; j++)
-			{
-				if (HalfIsNan(vec->x[j]))
-					elog(ERROR, "NaN detected. Please report a bug.");
-
-				if (HalfIsInf(vec->x[j]))
-					elog(ERROR, "Infinite value detected. Please report a bug.");
-			}
-		}
-		else if (type != IVFFLAT_TYPE_BIT)
-			elog(ERROR, "Unsupported type");
 	}
 
-	if (type != IVFFLAT_TYPE_BIT)
+	/* Ensure no duplicate centers */
+	/* Fine to sort in-place */
+	qsort(centers->items, centers->length, VECTOR_SIZE(centers->dim), CompareVectors);
+	for (int i = 1; i < centers->length; i++)
 	{
-		/* Ensure no duplicate centers */
+		if (CompareVectors(VectorArrayGet(centers, i), VectorArrayGet(centers, i - 1)) == 0)
-		SortVectorArray(centers, type);
+			elog(ERROR, "Duplicate centers detected. Please report a bug.");
-
-		for (int i = 1; i < centers->length; i++)
-		{
-			if (datumIsEqual(PointerGetDatum(VectorArrayGet(centers, i)), PointerGetDatum(VectorArrayGet(centers, i - 1)), false, -1))
-				elog(ERROR, "Duplicate centers detected. Please report a bug.");
-		}
 	}
 
 	/* Ensure no zero vectors for cosine distance */
@@ -772,12 +539,12 @@ CheckCenters(Relation index, VectorArray centers, IvfflatType type)
  * We use spherical k-means for inner product and cosine
  */
 void
-IvfflatKmeans(Relation index, VectorArray samples, VectorArray centers, IvfflatType type)
+IvfflatKmeans(Relation index, VectorArray samples, VectorArray centers)
 {
 	if (samples->length <= centers->maxlen)
-		QuickCenters(index, samples, centers, type);
+		QuickCenters(index, samples, centers);
 	else
-		ElkanKmeans(index, samples, centers, type);
+		ElkanKmeans(index, samples, centers);
 
-	CheckCenters(index, centers, type);
+	CheckCenters(index, centers);
 }

src/ivfscan.c

@@ -56,7 +56,7 @@ GetScanLists(IndexScanDesc scan, Datum value)
 			double		distance;
 
 			/* Use procinfo from the index instead of scan key for performance */
-			distance = DatumGetFloat8(so->distfunc(so->procinfo, so->collation, PointerGetDatum(&list->center), value));
+			distance = DatumGetFloat8(FunctionCall2Coll(so->procinfo, so->collation, PointerGetDatum(&list->center), value));
 
 			if (listCount < so->probes)
 			{
@@ -149,7 +149,7 @@ GetScanItems(IndexScanDesc scan, Datum value)
 				 * performance
 				 */
 				ExecClearTuple(slot);
-				slot->tts_values[0] = so->distfunc(so->procinfo, so->collation, datum, value);
+				slot->tts_values[0] = FunctionCall2Coll(so->procinfo, so->collation, datum, value);
 				slot->tts_isnull[0] = false;
 				slot->tts_values[1] = PointerGetDatum(&itup->t_tid);
 				slot->tts_isnull[1] = false;
@@ -177,46 +177,6 @@ GetScanItems(IndexScanDesc scan, Datum value)
 	tuplesort_performsort(so->sortstate);
 }
 
-/*
- * Zero distance
- */
-static Datum
-ZeroDistance(FmgrInfo *flinfo, Oid collation, Datum arg1, Datum arg2)
-{
-	return Float8GetDatum(0.0);
-}
-
-/*
- * Get scan value
- */
-static Datum
-GetScanValue(IndexScanDesc scan)
-{
-	IvfflatScanOpaque so = (IvfflatScanOpaque) scan->opaque;
-	Datum		value;
-
-	if (scan->orderByData->sk_flags & SK_ISNULL)
-	{
-		value = PointerGetDatum(NULL);
-		so->distfunc = ZeroDistance;
-	}
-	else
-	{
-		value = scan->orderByData->sk_argument;
-		so->distfunc = FunctionCall2Coll;
-
-		/* Value should not be compressed or toasted */
-		Assert(!VARATT_IS_COMPRESSED(DatumGetPointer(value)));
-		Assert(!VARATT_IS_EXTENDED(DatumGetPointer(value)));
-
-		/* Check normprocinfo since normalizeprocinfo not set for vector */
-		if (so->normprocinfo != NULL)
-			value = IvfflatNormValue(so->normalizeprocinfo, so->collation, value);
-	}
-
-	return value;
-}
-
 /*
  * Prepare for an index scan
  */
@@ -249,7 +209,6 @@ ivfflatbeginscan(Relation index, int nkeys, int norderbys)
 	/* Set support functions */
 	so->procinfo = index_getprocinfo(index, 1, IVFFLAT_DISTANCE_PROC);
 	so->normprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_NORM_PROC);
-	so->normalizeprocinfo = IvfflatOptionalProcInfo(index, IVFFLAT_NORMALIZE_PROC);
 	so->collation = index->rd_indcollation[0];
 
 	/* Create tuple description for sorting */
@@ -322,7 +281,21 @@ ivfflatgettuple(IndexScanDesc scan, ScanDirection dir)
 		if (!IsMVCCSnapshot(scan->xs_snapshot))
 			elog(ERROR, "non-MVCC snapshots are not supported with ivfflat");
 
-		value = GetScanValue(scan);
+		if (scan->orderByData->sk_flags & SK_ISNULL)
+			value = PointerGetDatum(InitVector(so->dimensions));
+		else
+		{
+			value = scan->orderByData->sk_argument;
+
+			/* Value should not be compressed or toasted */
+			Assert(!VARATT_IS_COMPRESSED(DatumGetPointer(value)));
+			Assert(!VARATT_IS_EXTENDED(DatumGetPointer(value)));
+
+			/* Fine if normalization fails */
+			if (so->normprocinfo != NULL)
+				IvfflatNormValue(so->normprocinfo, so->collation, &value);
+		}
+
 		IvfflatBench("GetScanLists", GetScanLists(scan, value));
 		IvfflatBench("GetScanItems", GetScanItems(scan, value));
 		so->first = false;

src/ivfutils.c

@@ -1,27 +1,22 @@
 #include "postgres.h"
 
 #include "access/generic_xlog.h"
-#include "catalog/pg_type.h"
-#include "fmgr.h"
 #include "ivfflat.h"
 #include "storage/bufmgr.h"
+#include "vector.h"
 
 /*
  * Allocate a vector array
  */
 VectorArray
-VectorArrayInit(int maxlen, int dimensions, Size itemsize)
+VectorArrayInit(int maxlen, int dimensions)
 {
 	VectorArray res = palloc(sizeof(VectorArrayData));
 
-	/* Ensure items are aligned to prevent UB */
-	itemsize = MAXALIGN(itemsize);
-
 	res->length = 0;
 	res->maxlen = maxlen;
 	res->dim = dimensions;
-	res->itemsize = itemsize;
+	res->items = palloc_extended(maxlen * VECTOR_SIZE(dimensions), MCXT_ALLOC_ZERO | MCXT_ALLOC_HUGE);
-	res->items = palloc_extended(maxlen * itemsize, MCXT_ALLOC_ZERO | MCXT_ALLOC_HUGE);
 	return res;
 }
 
@@ -35,6 +30,16 @@ VectorArrayFree(VectorArray arr)
 	pfree(arr);
 }
 
+/*
+ * Print vector array - useful for debugging
+ */
+void
+PrintVectorArray(char *msg, VectorArray arr)
+{
+	for (int i = 0; i < arr->length; i++)
+		PrintVector(msg, VectorArrayGet(arr, i));
+}
+
 /*
  * Get the number of lists in the index
  */
@@ -62,45 +67,32 @@ IvfflatOptionalProcInfo(Relation index, uint16 procnum)
 }
 
 /*
- * Get type
+ * Divide by the norm
- */
+ *
-IvfflatType
+ * Returns false if value should not be indexed
-IvfflatGetType(Relation index)
+ *
-{
+ * The caller needs to free the pointer stored in value
-	FmgrInfo   *procinfo = IvfflatOptionalProcInfo(index, IVFFLAT_TYPE_SUPPORT_PROC);
+ * if it's different than the original value
-	Oid			typid = TupleDescAttr(index->rd_att, 0)->atttypid;
-	IvfflatType result;
-
-	if (procinfo == NULL)
-		return IVFFLAT_TYPE_VECTOR;
-
-	result = (IvfflatType) DatumGetInt32(FunctionCall1(procinfo, ObjectIdGetDatum(typid)));
-
-	if (result == IVFFLAT_TYPE_UNSUPPORTED)
-		elog(ERROR, "type not supported for ivfflat index");
-
-	return result;
-}
-
-/*
- * Normalize value
- */
-Datum
-IvfflatNormValue(FmgrInfo *procinfo, Oid collation, Datum value)
-{
-	if (procinfo == NULL)
-		return DirectFunctionCall1(l2_normalize, value);
-
-	return FunctionCall1Coll(procinfo, collation, value);
-}
-
-/*
- * Check if non-zero norm
  */
 bool
-IvfflatCheckNorm(FmgrInfo *procinfo, Oid collation, Datum value)
+IvfflatNormValue(FmgrInfo *procinfo, Oid collation, Datum *value)
 {
-	return DatumGetFloat8(FunctionCall1Coll(procinfo, collation, value)) > 0;
+	double		norm = DatumGetFloat8(FunctionCall1Coll(procinfo, collation, *value));
+
+	if (norm > 0)
+	{
+		Vector	   *v = DatumGetVector(*value);
+		Vector	   *result = InitVector(v->dim);
+
+		for (int i = 0; i < v->dim; i++)
+			result->x[i] = v->x[i] / norm;
+
+		*value = PointerGetDatum(result);
+
+		return true;
+	}
+
+	return false;
 }
 
 /*
@@ -245,22 +237,3 @@ IvfflatUpdateList(Relation index, ListInfo listInfo,
 		UnlockReleaseBuffer(buf);
 	}
 }
-
-PGDLLEXPORT PG_FUNCTION_INFO_V1(halfvec_ivfflat_support);
-Datum
-halfvec_ivfflat_support(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_INT32(IVFFLAT_TYPE_HALFVEC);
-};
-
-PGDLLEXPORT PG_FUNCTION_INFO_V1(bit_ivfflat_support);
-Datum
-bit_ivfflat_support(PG_FUNCTION_ARGS)
-{
-	Oid			typid = PG_GETARG_OID(0);
-
-	if (typid == BITOID)
-		PG_RETURN_INT32(IVFFLAT_TYPE_BIT);
-	else
-		PG_RETURN_INT32(IVFFLAT_TYPE_UNSUPPORTED);
-};

src/sparsevec.h

@@ -1,27 +0,0 @@
-#ifndef SPARSEVEC_H
-#define SPARSEVEC_H
-
-#include "fmgr.h"
-
-#define SPARSEVEC_MAX_DIM 100000
-#define SPARSEVEC_MAX_NNZ 16000
-
-/* Ensure values are aligned */
-#define SPARSEVEC_SIZE(_nnz)		(offsetof(SparseVector, indices) + MAXALIGN((_nnz) * sizeof(int32)) + (_nnz * sizeof(float)))
-#define SPARSEVEC_VALUES(x)		((float *) (((char *) (x)) + offsetof(SparseVector, indices) + MAXALIGN((x)->nnz * sizeof(int32))))
-#define DatumGetSparseVector(x)		((SparseVector *) PG_DETOAST_DATUM(x))
-#define PG_GETARG_SPARSEVEC_P(x)	DatumGetSparseVector(PG_GETARG_DATUM(x))
-#define PG_RETURN_SPARSEVEC_P(x)	PG_RETURN_POINTER(x)
-
-typedef struct SparseVector
-{
-	int32		vl_len_;		/* varlena header (do not touch directly!) */
-	int32		dim;			/* number of dimensions */
-	int32		nnz;
-	int32		unused;
-	int32		indices[FLEXIBLE_ARRAY_MEMBER];
-}			SparseVector;
-
-SparseVector *InitSparseVector(int dim, int nnz);
-
-#endif

src/vector.c

@@ -2,19 +2,15 @@
 
 #include <math.h>
 
-#include "bitutils.h"
+#include "bitvector.h"
-#include "bitvec.h"
 #include "catalog/pg_type.h"
 #include "common/shortest_dec.h"
 #include "fmgr.h"
-#include "halfutils.h"
-#include "halfvec.h"
 #include "hnsw.h"
 #include "ivfflat.h"
 #include "lib/stringinfo.h"
 #include "libpq/pqformat.h"
 #include "port.h"				/* for strtof() */
-#include "sparsevec.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/float.h"
@@ -34,12 +30,6 @@
 #define STATE_DIMS(x) (ARR_DIMS(x)[0] - 1)
 #define CreateStateDatums(dim) palloc(sizeof(Datum) * (dim + 1))
 
-#if defined(USE_TARGET_CLONES) && !defined(__FMA__)
-#define VECTOR_TARGET_CLONES __attribute__((target_clones("default", "fma")))
-#else
-#define VECTOR_TARGET_CLONES
-#endif
-
 PG_MODULE_MAGIC;
 
 /*
@@ -49,8 +39,6 @@ PGDLLEXPORT void _PG_init(void);
 void
 _PG_init(void)
 {
-	BitvecInit();
-	HalfvecInit();
 	HnswInit();
 	IvfflatInit();
 }
@@ -189,33 +177,27 @@ vector_in(PG_FUNCTION_ARGS)
 	int32		typmod = PG_GETARG_INT32(2);
 	float		x[VECTOR_MAX_DIM];
 	int			dim = 0;
-	char	   *pt = lit;
+	char	   *pt;
+	char	   *stringEnd;
 	Vector	   *result;
+	char	   *litcopy = pstrdup(lit);
+	char	   *str = litcopy;
 
-	while (vector_isspace(*pt))
+	while (vector_isspace(*str))
-		pt++;
+		str++;
 
-	if (*pt != '[')
+	if (*str != '[')
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("invalid input syntax for type vector: \"%s\"", lit),
+				 errmsg("malformed vector literal: \"%s\"", lit),
 				 errdetail("Vector contents must start with \"[\".")));
 
-	pt++;
+	str++;
+	pt = strtok(str, ",");
+	stringEnd = pt;
 
-	while (vector_isspace(*pt))
+	while (pt != NULL && *stringEnd != ']')
-		pt++;
-
-	if (*pt == ']')
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("vector must have at least 1 dimension")));
-
-	for (;;)
 	{
-		float		val;
-		char	   *stringEnd;
-
 		if (dim == VECTOR_MAX_DIM)
 			ereport(ERROR,
 					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
@@ -230,55 +212,61 @@ vector_in(PG_FUNCTION_ARGS)
 					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
 					 errmsg("invalid input syntax for type vector: \"%s\"", lit)));
 
-		errno = 0;
-
 		/* Use strtof like float4in to avoid a double-rounding problem */
-		/* Postgres sets LC_NUMERIC to C on startup */
+		x[dim] = strtof(pt, &stringEnd);
-		val = strtof(pt, &stringEnd);
+		CheckElement(x[dim]);
+		dim++;
 
 		if (stringEnd == pt)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
 					 errmsg("invalid input syntax for type vector: \"%s\"", lit)));
 
-		/* Check for range error like float4in */
+		while (vector_isspace(*stringEnd))
-		if (errno == ERANGE && isinf(val))
+			stringEnd++;
-			ereport(ERROR,
-					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-					 errmsg("\"%s\" is out of range for type vector", pnstrdup(pt, stringEnd - pt))));
 
-		CheckElement(val);
+		if (*stringEnd != '\0' && *stringEnd != ']')
-		x[dim++] = val;
-
-		pt = stringEnd;
-
-		while (vector_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 vector: \"%s\"", lit)));
+
+		pt = strtok(NULL, ",");
 	}
 
-	/* Only whitespace is allowed after the closing brace */
+	if (stringEnd == NULL || *stringEnd != ']')
-	while (vector_isspace(*pt))
-		pt++;
-
-	if (*pt != '\0')
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("invalid input syntax for type vector: \"%s\"", lit),
+				 errmsg("malformed vector literal: \"%s\"", lit),
+				 errdetail("Unexpected end of input.")));
+
+	stringEnd++;
+
+	/* Only whitespace is allowed after the closing brace */
+	while (vector_isspace(*stringEnd))
+		stringEnd++;
+
+	if (*stringEnd != '\0')
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+				 errmsg("malformed vector literal: \"%s\"", lit),
 				 errdetail("Junk after closing right brace.")));
 
-	CheckDim(dim);
+	/* 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 vector literal: \"%s\"", lit)));
+	}
+
+	if (dim < 1)
+		ereport(ERROR,
+				(errcode(ERRCODE_DATA_EXCEPTION),
+				 errmsg("vector must have at least 1 dimension")));
+
+	pfree(litcopy);
+
 	CheckExpectedDim(typmod, dim);
 
 	result = InitVector(dim);
@@ -543,44 +531,6 @@ vector_to_float4(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(result);
 }
 
-/*
- * Convert half vector to vector
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(halfvec_to_vector);
-Datum
-halfvec_to_vector(PG_FUNCTION_ARGS)
-{
-	HalfVector *vec = PG_GETARG_HALFVEC_P(0);
-	int32		typmod = PG_GETARG_INT32(1);
-	Vector	   *result;
-
-	CheckDim(vec->dim);
-	CheckExpectedDim(typmod, vec->dim);
-
-	result = InitVector(vec->dim);
-
-	for (int i = 0; i < vec->dim; i++)
-		result->x[i] = HalfToFloat4(vec->x[i]);
-
-	PG_RETURN_POINTER(result);
-}
-
-VECTOR_TARGET_CLONES static float
-VectorL2SquaredDistance(int dim, float *ax, float *bx)
-{
-	float		distance = 0.0;
-
-	/* Auto-vectorized */
-	for (int i = 0; i < dim; i++)
-	{
-		float		diff = ax[i] - bx[i];
-
-		distance += diff * diff;
-	}
-
-	return distance;
-}
-
 /*
  * Get the L2 distance between vectors
  */
@@ -590,10 +540,21 @@ l2_distance(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
+	float	   *ax = a->x;
+	float	   *bx = b->x;
+	float		distance = 0.0;
+	float		diff;
 
 	CheckDims(a, b);
 
-	PG_RETURN_FLOAT8(sqrt((double) VectorL2SquaredDistance(a->dim, a->x, b->x)));
+	/* Auto-vectorized */
+	for (int i = 0; i < a->dim; i++)
+	{
+		diff = ax[i] - bx[i];
+		distance += diff * diff;
+	}
+
+	PG_RETURN_FLOAT8(sqrt((double) distance));
 }
 
 /*
@@ -606,22 +567,21 @@ vector_l2_squared_distance(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
+	float	   *ax = a->x;
+	float	   *bx = b->x;
+	float		distance = 0.0;
+	float		diff;
 
 	CheckDims(a, b);
 
-	PG_RETURN_FLOAT8((double) VectorL2SquaredDistance(a->dim, a->x, b->x));
-}
-
-VECTOR_TARGET_CLONES static float
-VectorInnerProduct(int dim, float *ax, float *bx)
-{
-	float		distance = 0.0;
-
 	/* Auto-vectorized */
-	for (int i = 0; i < dim; i++)
+	for (int i = 0; i < a->dim; i++)
-		distance += ax[i] * bx[i];
+	{
+		diff = ax[i] - bx[i];
+		distance += diff * diff;
+	}
 
-	return distance;
+	PG_RETURN_FLOAT8((double) distance);
 }
 
 /*
@@ -633,10 +593,17 @@ inner_product(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
+	float	   *ax = a->x;
+	float	   *bx = b->x;
+	float		distance = 0.0;
 
 	CheckDims(a, b);
 
-	PG_RETURN_FLOAT8((double) VectorInnerProduct(a->dim, a->x, b->x));
+	/* Auto-vectorized */
+	for (int i = 0; i < a->dim; i++)
+		distance += ax[i] * bx[i];
+
+	PG_RETURN_FLOAT8((double) distance);
 }
 
 /*
@@ -648,29 +615,17 @@ vector_negative_inner_product(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
+	float	   *ax = a->x;
+	float	   *bx = b->x;
+	float		distance = 0.0;
 
 	CheckDims(a, b);
 
-	PG_RETURN_FLOAT8((double) -VectorInnerProduct(a->dim, a->x, b->x));
-}
-
-VECTOR_TARGET_CLONES static double
-VectorCosineSimilarity(int dim, float *ax, float *bx)
-{
-	float		similarity = 0.0;
-	float		norma = 0.0;
-	float		normb = 0.0;
-
 	/* Auto-vectorized */
-	for (int i = 0; i < dim; i++)
+	for (int i = 0; i < a->dim; i++)
-	{
+		distance += ax[i] * bx[i];
-		similarity += ax[i] * bx[i];
-		norma += ax[i] * ax[i];
-		normb += bx[i] * bx[i];
-	}
 
-	/* Use sqrt(a * b) over sqrt(a) * sqrt(b) */
+	PG_RETURN_FLOAT8((double) distance * -1);
-	return (double) similarity / sqrt((double) norma * (double) normb);
 }
 
 /*
@@ -682,11 +637,25 @@ cosine_distance(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
+	float	   *ax = a->x;
+	float	   *bx = b->x;
+	float		distance = 0.0;
+	float		norma = 0.0;
+	float		normb = 0.0;
 	double		similarity;
 
 	CheckDims(a, b);
 
-	similarity = VectorCosineSimilarity(a->dim, a->x, b->x);
+	/* Auto-vectorized */
+	for (int i = 0; i < a->dim; i++)
+	{
+		distance += ax[i] * bx[i];
+		norma += ax[i] * ax[i];
+		normb += bx[i] * bx[i];
+	}
+
+	/* 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 */
@@ -714,11 +683,18 @@ vector_spherical_distance(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
+	float	   *ax = a->x;
+	float	   *bx = b->x;
+	float		dp = 0.0;
 	double		distance;
 
 	CheckDims(a, b);
 
-	distance = (double) VectorInnerProduct(a->dim, a->x, b->x);
+	/* Auto-vectorized */
+	for (int i = 0; i < a->dim; i++)
+		dp += ax[i] * bx[i];
+
+	distance = (double) dp;
 
 	/* Prevent NaN with acos with loss of precision */
 	if (distance > 1)
@@ -729,19 +705,6 @@ vector_spherical_distance(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT8(acos(distance) / M_PI);
 }
 
-/* Does not require FMA, but keep logic simple */
-VECTOR_TARGET_CLONES static float
-VectorL1Distance(int dim, float *ax, float *bx)
-{
-	float		distance = 0.0;
-
-	/* Auto-vectorized */
-	for (int i = 0; i < dim; i++)
-		distance += fabsf(ax[i] - bx[i]);
-
-	return distance;
-}
-
 /*
  * Get the L1 distance between two vectors
  */
@@ -751,10 +714,17 @@ l1_distance(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	Vector	   *b = PG_GETARG_VECTOR_P(1);
+	float	   *ax = a->x;
+	float	   *bx = b->x;
+	float		distance = 0.0;
 
 	CheckDims(a, b);
 
-	PG_RETURN_FLOAT8((double) VectorL1Distance(a->dim, a->x, b->x));
+	/* Auto-vectorized */
+	for (int i = 0; i < a->dim; i++)
+		distance += fabsf(ax[i] - bx[i]);
+
+	PG_RETURN_FLOAT8((double) distance);
 }
 
 /*
@@ -787,45 +757,6 @@ vector_norm(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT8(sqrt(norm));
 }
 
-/*
- * Normalize a vector with the L2 norm
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(l2_normalize);
-Datum
-l2_normalize(PG_FUNCTION_ARGS)
-{
-	Vector	   *a = PG_GETARG_VECTOR_P(0);
-	float	   *ax = a->x;
-	double		norm = 0;
-	Vector	   *result;
-	float	   *rx;
-
-	result = InitVector(a->dim);
-	rx = result->x;
-
-	/* Auto-vectorized */
-	for (int i = 0; i < a->dim; i++)
-		norm += (double) ax[i] * (double) ax[i];
-
-	norm = sqrt(norm);
-
-	/* Return zero vector for zero norm */
-	if (norm > 0)
-	{
-		for (int i = 0; i < a->dim; i++)
-			rx[i] = ax[i] / norm;
-
-		/* Check for overflow */
-		for (int i = 0; i < a->dim; i++)
-		{
-			if (isinf(rx[i]))
-				float_overflow_error();
-		}
-	}
-
-	PG_RETURN_POINTER(result);
-}
-
 /*
  * Add vectors
  */
@@ -928,36 +859,12 @@ vector_mul(PG_FUNCTION_ARGS)
 	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);
-}
-
 /*
  * Quantize a vector
  */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(binary_quantize);
+PGDLLEXPORT PG_FUNCTION_INFO_V1(quantize_binary);
 Datum
-binary_quantize(PG_FUNCTION_ARGS)
+quantize_binary(PG_FUNCTION_ARGS)
 {
 	Vector	   *a = PG_GETARG_VECTOR_P(0);
 	float	   *ax = a->x;
@@ -1002,6 +909,30 @@ subvector(PG_FUNCTION_ARGS)
 	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
  */
@@ -1182,7 +1113,7 @@ vector_accum(PG_FUNCTION_ARGS)
 }
 
 /*
- * Combine vectors or half vectors
+ * Combine vectors
  */
 PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_combine);
 Datum
@@ -1284,26 +1215,3 @@ vector_avg(PG_FUNCTION_ARGS)
 
 	PG_RETURN_POINTER(result);
 }
-
-/*
- * Convert sparse vector to dense vector
- */
-PGDLLEXPORT PG_FUNCTION_INFO_V1(sparsevec_to_vector);
-Datum
-sparsevec_to_vector(PG_FUNCTION_ARGS)
-{
-	SparseVector *svec = PG_GETARG_SPARSEVEC_P(0);
-	int32		typmod = PG_GETARG_INT32(1);
-	Vector	   *result;
-	int			dim = svec->dim;
-	float	   *values = SPARSEVEC_VALUES(svec);
-
-	CheckDim(dim);
-	CheckExpectedDim(typmod, dim);
-
-	result = InitVector(dim);
-	for (int i = 0; i < svec->nnz; i++)
-		result->x[svec->indices[i] - 1] = values[i];
-
-	PG_RETURN_POINTER(result);
-}

src/vector.h

@@ -1,8 +1,6 @@
 #ifndef VECTOR_H
 #define VECTOR_H
 
-#include "fmgr.h"
-
 #define VECTOR_MAX_DIM 16000
 
 #define VECTOR_SIZE(_dim)		(offsetof(Vector, x) + sizeof(float)*(_dim))
@@ -21,6 +19,5 @@ typedef struct Vector
 Vector	   *InitVector(int dim);
 void		PrintVector(char *msg, Vector * vector);
 int			vector_cmp_internal(Vector * a, Vector * b);
-PGDLLEXPORT Datum l2_normalize(PG_FUNCTION_ARGS);
 
 #endif

test/expected/bit_functions.out

@@ -1,140 +1,64 @@
-SELECT hamming_distance('111', '111');
+SELECT hamming_distance(B'111', B'111');
  hamming_distance 
 ------------------
                 0
 (1 row)
 
-SELECT hamming_distance('111', '110');
+SELECT hamming_distance(B'111', B'110');
  hamming_distance 
 ------------------
                 1
 (1 row)
 
-SELECT hamming_distance('111', '100');
+SELECT hamming_distance(B'111', B'100');
  hamming_distance 
 ------------------
                 2
 (1 row)
 
-SELECT hamming_distance('111', '000');
+SELECT hamming_distance(B'111', B'000');
  hamming_distance 
 ------------------
                 3
 (1 row)
 
-SELECT hamming_distance('10101010101010101010', '01010101010101010101');
+SELECT hamming_distance(B'111', B'00');
- hamming_distance 
-------------------
-               20
-(1 row)
-
-SELECT hamming_distance('101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101', '101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101');
- hamming_distance 
-------------------
-                0
-(1 row)
-
-SELECT hamming_distance('101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101', '010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010');
- hamming_distance 
-------------------
-              513
-(1 row)
-
-SELECT hamming_distance('110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011', '100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001');
- hamming_distance 
-------------------
-                2
-(1 row)
-
-SELECT hamming_distance('', '');
- hamming_distance 
-------------------
-                0
-(1 row)
-
-SELECT hamming_distance('111', '00');
 ERROR:  different bit lengths 3 and 2
-SELECT hamming_distance('111', '000'::varbit(4));
+SELECT jaccard_distance(B'1111', B'1111');
- hamming_distance 
-------------------
-                3
-(1 row)
-
-SELECT hamming_distance('111', '0000'::varbit(4));
-ERROR:  different bit lengths 3 and 4
-SELECT jaccard_distance('1111', '1111');
  jaccard_distance 
 ------------------
                 0
 (1 row)
 
-SELECT jaccard_distance('1111', '1110');
+SELECT jaccard_distance(B'1111', B'1110');
  jaccard_distance 
 ------------------
              0.25
 (1 row)
 
-SELECT jaccard_distance('1111', '1100');
+SELECT jaccard_distance(B'1111', B'1100');
  jaccard_distance 
 ------------------
               0.5
 (1 row)
 
-SELECT jaccard_distance('1111', '1000');
+SELECT jaccard_distance(B'1111', B'1000');
  jaccard_distance 
 ------------------
              0.75
 (1 row)
 
-SELECT jaccard_distance('1111', '0000');
+SELECT jaccard_distance(B'1111', B'0000');
  jaccard_distance 
 ------------------
                 1
 (1 row)
 
-SELECT jaccard_distance('1100', '1000');
+SELECT jaccard_distance(B'1100', B'1000');
  jaccard_distance 
 ------------------
               0.5
 (1 row)
 
-SELECT jaccard_distance('10101010101010101010', '01010101010101010101');
+SELECT jaccard_distance(B'1111', B'000');
- jaccard_distance 
-------------------
-                1
-(1 row)
-
-SELECT jaccard_distance('101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101', '101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101');
- jaccard_distance 
-------------------
-                0
-(1 row)
-
-SELECT jaccard_distance('101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101', '010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010');
- jaccard_distance 
-------------------
-                1
-(1 row)
-
-SELECT jaccard_distance('110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011', '100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001');
- jaccard_distance 
-------------------
-              0.5
-(1 row)
-
-SELECT jaccard_distance('', '');
- jaccard_distance 
-------------------
-                1
-(1 row)
-
-SELECT jaccard_distance('1111', '000');
 ERROR:  different bit lengths 4 and 3
-SELECT jaccard_distance('1111', '0000'::varbit(5));
- jaccard_distance 
-------------------
-                1
-(1 row)
-
-SELECT jaccard_distance('1111', '00000'::varbit(5));
-ERROR:  different bit lengths 4 and 5

test/expected/btree.out

@@ -8,13 +8,10 @@ SELECT * FROM t WHERE val = '[1,2,3]';
  [1,2,3]
 (1 row)
 
-SELECT * FROM t ORDER BY val;
+SELECT * FROM t ORDER BY val LIMIT 1;
    val   
 ---------
  [0,0,0]
- [1,1,1]
+(1 row)
- [1,2,3]
- 
-(4 rows)
 
 DROP TABLE t;

test/expected/btree_halfvec.out

@@ -1,20 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t (val);
-SELECT * FROM t WHERE val = '[1,2,3]';
-   val   
----------
- [1,2,3]
-(1 row)
-
-SELECT * FROM t ORDER BY val;
-   val   
----------
- [0,0,0]
- [1,1,1]
- [1,2,3]
- 
-(4 rows)
-
-DROP TABLE t;

test/expected/btree_sparsevec.out

@@ -1,20 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val sparsevec(3));
-INSERT INTO t (val) VALUES ('{}/3'), ('{1:1,2:2,3:3}/3'), ('{1:1,2:1,3:1}/3'), (NULL);
-CREATE INDEX ON t (val);
-SELECT * FROM t WHERE val = '{1:1,2:2,3:3}/3';
-       val       
------------------
- {1:1,2:2,3:3}/3
-(1 row)
-
-SELECT * FROM t ORDER BY val;
-       val       
------------------
- {}/3
- {1:1,2:1,3:1}/3
- {1:1,2:2,3:3}/3
- 
-(4 rows)
-
-DROP TABLE t;

test/expected/cast.out

@@ -28,26 +28,6 @@ SELECT ARRAY[1,2,3]::numeric[]::vector;
  [1,2,3]
 (1 row)
 
-SELECT '[1,2,3]'::vector::real[];
- float4  
----------
- {1,2,3}
-(1 row)
-
-SELECT '{1,2,3}'::real[]::vector;
- vector  
----------
- [1,2,3]
-(1 row)
-
-SELECT '{1,2,3}'::real[]::vector(3);
- vector  
----------
- [1,2,3]
-(1 row)
-
-SELECT '{1,2,3}'::real[]::vector(2);
-ERROR:  expected 2 dimensions, not 3
 SELECT '{NULL}'::real[]::vector;
 ERROR:  array must not contain nulls
 SELECT '{NaN}'::real[]::vector;
@@ -60,152 +40,10 @@ SELECT '{}'::real[]::vector;
 ERROR:  vector must have at least 1 dimension
 SELECT '{{1}}'::real[]::vector;
 ERROR:  array must be 1-D
-SELECT '{1,2,3}'::double precision[]::vector;
+SELECT '[1,2,3]'::vector::real[];
- vector  
+ float4  
 ---------
- [1,2,3]
+ {1,2,3}
-(1 row)
-
-SELECT '{1,2,3}'::double precision[]::vector(3);
- vector  
----------
- [1,2,3]
-(1 row)
-
-SELECT '{1,2,3}'::double precision[]::vector(2);
-ERROR:  expected 2 dimensions, not 3
-SELECT '{4e38,-4e38}'::double precision[]::vector;
-ERROR:  infinite value not allowed in vector
-SELECT '{1e-46,-1e-46}'::double precision[]::vector;
- vector 
---------
- [0,-0]
-(1 row)
-
-SELECT '[1,2,3]'::vector::halfvec;
- halfvec 
----------
- [1,2,3]
-(1 row)
-
-SELECT '[1,2,3]'::vector::halfvec(3);
- halfvec 
----------
- [1,2,3]
-(1 row)
-
-SELECT '[1,2,3]'::vector::halfvec(2);
-ERROR:  expected 2 dimensions, not 3
-SELECT '[65520]'::vector::halfvec;
-ERROR:  "65520" is out of range for type halfvec
-SELECT '[1e-8]'::vector::halfvec;
- halfvec 
----------
- [0]
-(1 row)
-
-SELECT '[1,2,3]'::halfvec::vector;
- vector  
----------
- [1,2,3]
-(1 row)
-
-SELECT '[1,2,3]'::halfvec::vector(3);
- vector  
----------
- [1,2,3]
-(1 row)
-
-SELECT '[1,2,3]'::halfvec::vector(2);
-ERROR:  expected 2 dimensions, not 3
-SELECT '{1,2,3}'::real[]::halfvec;
- halfvec 
----------
- [1,2,3]
-(1 row)
-
-SELECT '{1,2,3}'::real[]::halfvec(3);
- halfvec 
----------
- [1,2,3]
-(1 row)
-
-SELECT '{1,2,3}'::real[]::halfvec(2);
-ERROR:  expected 2 dimensions, not 3
-SELECT '{65520,-65520}'::real[]::halfvec;
-ERROR:  "65520" is out of range for type halfvec
-SELECT '{1e-8,-1e-8}'::real[]::halfvec;
- halfvec 
----------
- [0,-0]
-(1 row)
-
-SELECT '[0,1.5,0,3.5,0]'::vector::sparsevec;
-    sparsevec    
------------------
- {2:1.5,4:3.5}/5
-(1 row)
-
-SELECT '[0,1.5,0,3.5,0]'::vector::sparsevec(5);
-    sparsevec    
------------------
- {2:1.5,4:3.5}/5
-(1 row)
-
-SELECT '[0,1.5,0,3.5,0]'::vector::sparsevec(4);
-ERROR:  expected 4 dimensions, not 5
-SELECT '{2:1.5,4:3.5}/5'::sparsevec::vector;
-     vector      
------------------
- [0,1.5,0,3.5,0]
-(1 row)
-
-SELECT '{2:1.5,4:3.5}/5'::sparsevec::vector(5);
-     vector      
------------------
- [0,1.5,0,3.5,0]
-(1 row)
-
-SELECT '{2:1.5,4:3.5}/5'::sparsevec::vector(4);
-ERROR:  expected 4 dimensions, not 5
-SELECT '{}/16001'::sparsevec::vector;
-ERROR:  vector cannot have more than 16000 dimensions
-SELECT '[0,1.5,0,3.5,0]'::halfvec::sparsevec;
-    sparsevec    
------------------
- {2:1.5,4:3.5}/5
-(1 row)
-
-SELECT '[0,1.5,0,3.5,0]'::halfvec::sparsevec(5);
-    sparsevec    
------------------
- {2:1.5,4:3.5}/5
-(1 row)
-
-SELECT '[0,1.5,0,3.5,0]'::halfvec::sparsevec(4);
-ERROR:  expected 4 dimensions, not 5
-SELECT '{2:1.5,4:3.5}/5'::sparsevec::halfvec;
-     halfvec     
------------------
- [0,1.5,0,3.5,0]
-(1 row)
-
-SELECT '{2:1.5,4:3.5}/5'::sparsevec::halfvec(5);
-     halfvec     
------------------
- [0,1.5,0,3.5,0]
-(1 row)
-
-SELECT '{2:1.5,4:3.5}/5'::sparsevec::halfvec(4);
-ERROR:  expected 4 dimensions, not 5
-SELECT '{}/16001'::sparsevec::halfvec;
-ERROR:  halfvec cannot have more than 16000 dimensions
-SELECT '{1:65520}/1'::sparsevec::halfvec;
-ERROR:  "65520" is out of range for type halfvec
-SELECT '{1:1e-8}/1'::sparsevec::halfvec;
- halfvec 
----------
- [0]
 (1 row)
 
 SELECT array_agg(n)::vector FROM generate_series(1, 16001) n;

test/expected/copy.out

@@ -1,15 +1,15 @@
-CREATE TABLE t (val vector(3), val2 halfvec(3), val3 sparsevec(3));
+CREATE TABLE t (val vector(3));
-INSERT INTO t (val, val2, val3) VALUES ('[0,0,0]', '[0,0,0]', '{}/3'), ('[1,2,3]', '[1,2,3]', '{1:1,2:2,3:3}/3'), ('[1,1,1]', '[1,1,1]', '{1:1,2:1,3:1}/3'), (NULL, NULL, NULL);
+INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE TABLE t2 (val vector(3), val2 halfvec(3), val3 sparsevec(3));
+CREATE TABLE t2 (val vector(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   |  val2   |      val3       
+   val   
----------+---------+-----------------
+---------
- [0,0,0] | [0,0,0] | {}/3
+ [0,0,0]
- [1,1,1] | [1,1,1] | {1:1,2:1,3:1}/3
+ [1,1,1]
- [1,2,3] | [1,2,3] | {1:1,2:2,3:3}/3
+ [1,2,3]
-         |         | 
+ 
 (4 rows)
 
 DROP TABLE t;

test/expected/halfvec_functions.out

@@ -1,446 +0,0 @@
-SELECT '[1,2,3]'::halfvec + '[4,5,6]';
- ?column? 
-----------
- [5,7,9]
-(1 row)
-
-SELECT '[65519]'::halfvec + '[65519]';
-ERROR:  value out of range: overflow
-SELECT '[1,2]'::halfvec + '[3]';
-ERROR:  different halfvec dimensions 2 and 1
-SELECT '[1,2,3]'::halfvec - '[4,5,6]';
-  ?column?  
-------------
- [-3,-3,-3]
-(1 row)
-
-SELECT '[-65519]'::halfvec - '[65519]';
-ERROR:  value out of range: overflow
-SELECT '[1,2]'::halfvec - '[3]';
-ERROR:  different halfvec dimensions 2 and 1
-SELECT '[1,2,3]'::halfvec * '[4,5,6]';
- ?column?  
------------
- [4,10,18]
-(1 row)
-
-SELECT '[65519]'::halfvec * '[65519]';
-ERROR:  value out of range: overflow
-SELECT '[1e-7]'::halfvec * '[1e-7]';
-ERROR:  value out of range: underflow
-SELECT '[1,2]'::halfvec * '[3]';
-ERROR:  different halfvec dimensions 2 and 1
-SELECT '[1,2,3]'::halfvec || '[4,5]';
-  ?column?   
--------------
- [1,2,3,4,5]
-(1 row)
-
-SELECT array_fill(0, ARRAY[16000])::halfvec || '[1]';
-ERROR:  halfvec cannot have more than 16000 dimensions
-SELECT '[1,2,3]'::halfvec < '[1,2,3]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::halfvec < '[1,2]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::halfvec <= '[1,2,3]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::halfvec <= '[1,2]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::halfvec = '[1,2,3]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::halfvec = '[1,2]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::halfvec != '[1,2,3]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::halfvec != '[1,2]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::halfvec >= '[1,2,3]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::halfvec >= '[1,2]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '[1,2,3]'::halfvec > '[1,2,3]';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '[1,2,3]'::halfvec > '[1,2]';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT halfvec_cmp('[1,2,3]', '[1,2,3]');
- halfvec_cmp 
--------------
-           0
-(1 row)
-
-SELECT halfvec_cmp('[1,2,3]', '[0,0,0]');
- halfvec_cmp 
--------------
-           1
-(1 row)
-
-SELECT halfvec_cmp('[0,0,0]', '[1,2,3]');
- halfvec_cmp 
--------------
-          -1
-(1 row)
-
-SELECT halfvec_cmp('[1,2]', '[1,2,3]');
- halfvec_cmp 
--------------
-          -1
-(1 row)
-
-SELECT halfvec_cmp('[1,2,3]', '[1,2]');
- halfvec_cmp 
--------------
-           1
-(1 row)
-
-SELECT halfvec_cmp('[1,2]', '[2,3,4]');
- halfvec_cmp 
--------------
-          -1
-(1 row)
-
-SELECT halfvec_cmp('[2,3]', '[1,2,3]');
- halfvec_cmp 
--------------
-           1
-(1 row)
-
-SELECT vector_dims('[1,2,3]'::halfvec);
- vector_dims 
--------------
-           3
-(1 row)
-
-SELECT round(l2_norm('[1,1]'::halfvec)::numeric, 5);
-  round  
----------
- 1.41421
-(1 row)
-
-SELECT l2_norm('[3,4]'::halfvec);
- l2_norm 
----------
-       5
-(1 row)
-
-SELECT l2_norm('[0,1]'::halfvec);
- l2_norm 
----------
-       1
-(1 row)
-
-SELECT l2_distance('[0,0]'::halfvec, '[3,4]');
- l2_distance 
--------------
-           5
-(1 row)
-
-SELECT l2_distance('[0,0]'::halfvec, '[0,1]');
- l2_distance 
--------------
-           1
-(1 row)
-
-SELECT l2_distance('[1,2]'::halfvec, '[3]');
-ERROR:  different halfvec dimensions 2 and 1
-SELECT l2_distance('[1,1,1,1,1,1,1,1,1]'::halfvec, '[1,1,1,1,1,1,1,4,5]');
- l2_distance 
--------------
-           5
-(1 row)
-
-SELECT '[0,0]'::halfvec <-> '[3,4]';
- ?column? 
-----------
-        5
-(1 row)
-
-SELECT inner_product('[1,2]'::halfvec, '[3,4]');
- inner_product 
----------------
-            11
-(1 row)
-
-SELECT inner_product('[1,2]'::halfvec, '[3]');
-ERROR:  different halfvec dimensions 2 and 1
-SELECT inner_product('[65504]'::halfvec, '[65504]');
- inner_product 
----------------
-    4290774016
-(1 row)
-
-SELECT inner_product('[1,1,1,1,1,1,1,1,1]'::halfvec, '[1,2,3,4,5,6,7,8,9]');
- inner_product 
----------------
-            45
-(1 row)
-
-SELECT '[1,2]'::halfvec <#> '[3,4]';
- ?column? 
-----------
-      -11
-(1 row)
-
-SELECT cosine_distance('[1,2]'::halfvec, '[2,4]');
- cosine_distance 
------------------
-               0
-(1 row)
-
-SELECT cosine_distance('[1,2]'::halfvec, '[0,0]');
- cosine_distance 
------------------
-             NaN
-(1 row)
-
-SELECT cosine_distance('[1,1]'::halfvec, '[1,1]');
- cosine_distance 
------------------
-               0
-(1 row)
-
-SELECT cosine_distance('[1,0]'::halfvec, '[0,2]');
- cosine_distance 
------------------
-               1
-(1 row)
-
-SELECT cosine_distance('[1,1]'::halfvec, '[-1,-1]');
- cosine_distance 
------------------
-               2
-(1 row)
-
-SELECT cosine_distance('[1,2]'::halfvec, '[3]');
-ERROR:  different halfvec dimensions 2 and 1
-SELECT cosine_distance('[1,1]'::halfvec, '[1.1,1.1]');
- cosine_distance 
------------------
-               0
-(1 row)
-
-SELECT cosine_distance('[1,1]'::halfvec, '[-1.1,-1.1]');
- cosine_distance 
------------------
-               2
-(1 row)
-
-SELECT cosine_distance('[1,2,3,4,5,6,7,8,9]'::halfvec, '[1,2,3,4,5,6,7,8,9]');
- cosine_distance 
------------------
-               0
-(1 row)
-
-SELECT cosine_distance('[1,2,3,4,5,6,7,8,9]'::halfvec, '[-1,-2,-3,-4,-5,-6,-7,-8,-9]');
- cosine_distance 
------------------
-               2
-(1 row)
-
-SELECT '[1,2]'::halfvec <=> '[2,4]';
- ?column? 
-----------
-        0
-(1 row)
-
-SELECT l1_distance('[0,0]'::halfvec, '[3,4]');
- l1_distance 
--------------
-           7
-(1 row)
-
-SELECT l1_distance('[0,0]'::halfvec, '[0,1]');
- l1_distance 
--------------
-           1
-(1 row)
-
-SELECT l1_distance('[1,2]'::halfvec, '[3]');
-ERROR:  different halfvec dimensions 2 and 1
-SELECT l1_distance('[1,2,3,4,5,6,7,8,9]'::halfvec, '[1,2,3,4,5,6,7,8,9]');
- l1_distance 
--------------
-           0
-(1 row)
-
-SELECT l1_distance('[1,2,3,4,5,6,7,8,9]'::halfvec, '[0,3,2,5,4,7,6,9,8]');
- l1_distance 
--------------
-           9
-(1 row)
-
-SELECT '[0,0]'::halfvec <+> '[3,4]';
- ?column? 
-----------
-        7
-(1 row)
-
-SELECT l2_normalize('[3,4]'::halfvec);
-      l2_normalize      
-------------------------
- [0.60009766,0.7998047]
-(1 row)
-
-SELECT l2_normalize('[3,0]'::halfvec);
- l2_normalize 
---------------
- [1,0]
-(1 row)
-
-SELECT l2_normalize('[0,0.1]'::halfvec);
- l2_normalize 
---------------
- [0,1]
-(1 row)
-
-SELECT l2_normalize('[0,0]'::halfvec);
- l2_normalize 
---------------
- [0,0]
-(1 row)
-
-SELECT l2_normalize('[65504]'::halfvec);
- l2_normalize 
---------------
- [1]
-(1 row)
-
-SELECT binary_quantize('[1,0,-1]'::halfvec);
- binary_quantize 
------------------
- 100
-(1 row)
-
-SELECT binary_quantize('[0,0.1,-0.2,-0.3,0.4,0.5,0.6,-0.7,0.8,-0.9,1]'::halfvec);
- binary_quantize 
------------------
- 01001110101
-(1 row)
-
-SELECT subvector('[1,2,3,4,5]'::halfvec, 1, 3);
- subvector 
------------
- [1,2,3]
-(1 row)
-
-SELECT subvector('[1,2,3,4,5]'::halfvec, 3, 2);
- subvector 
------------
- [3,4]
-(1 row)
-
-SELECT subvector('[1,2,3,4,5]'::halfvec, -1, 3);
- subvector 
------------
- [1]
-(1 row)
-
-SELECT subvector('[1,2,3,4,5]'::halfvec, 3, 9);
- subvector 
------------
- [3,4,5]
-(1 row)
-
-SELECT subvector('[1,2,3,4,5]'::halfvec, 1, 0);
-ERROR:  halfvec must have at least 1 dimension
-SELECT subvector('[1,2,3,4,5]'::halfvec, 3, -1);
-ERROR:  halfvec must have at least 1 dimension
-SELECT subvector('[1,2,3,4,5]'::halfvec, -1, 2);
-ERROR:  halfvec must have at least 1 dimension
-SELECT avg(v) FROM unnest(ARRAY['[1,2,3]'::halfvec, '[3,5,7]']) v;
-    avg    
------------
- [2,3.5,5]
-(1 row)
-
-SELECT avg(v) FROM unnest(ARRAY['[1,2,3]'::halfvec, '[3,5,7]', NULL]) v;
-    avg    
------------
- [2,3.5,5]
-(1 row)
-
-SELECT avg(v) FROM unnest(ARRAY[]::halfvec[]) v;
- avg 
------
- 
-(1 row)
-
-SELECT avg(v) FROM unnest(ARRAY['[1,2]'::halfvec, '[3]']) v;
-ERROR:  expected 2 dimensions, not 1
-SELECT avg(v) FROM unnest(ARRAY['[65504]'::halfvec, '[65504]']) v;
-   avg   
----------
- [65504]
-(1 row)
-
-SELECT halfvec_avg(array_agg(n)) FROM generate_series(1, 16002) n;
-ERROR:  halfvec cannot have more than 16000 dimensions
-SELECT sum(v) FROM unnest(ARRAY['[1,2,3]'::halfvec, '[3,5,7]']) v;
-   sum    
-----------
- [4,7,10]
-(1 row)
-
-SELECT sum(v) FROM unnest(ARRAY['[1,2,3]'::halfvec, '[3,5,7]', NULL]) v;
-   sum    
-----------
- [4,7,10]
-(1 row)
-
-SELECT sum(v) FROM unnest(ARRAY[]::halfvec[]) v;
- sum 
------
- 
-(1 row)
-
-SELECT sum(v) FROM unnest(ARRAY['[1,2]'::halfvec, '[3]']) v;
-ERROR:  different halfvec dimensions 2 and 1
-SELECT sum(v) FROM unnest(ARRAY['[65504]'::halfvec, '[65504]']) v;
-ERROR:  value out of range: overflow

test/expected/halfvec_input.out

@@ -1,164 +0,0 @@
-SELECT '[1,2,3]'::halfvec;
- halfvec 
----------
- [1,2,3]
-(1 row)
-
-SELECT '[-1,-2,-3]'::halfvec;
-  halfvec   
-------------
- [-1,-2,-3]
-(1 row)
-
-SELECT '[1.,2.,3.]'::halfvec;
- halfvec 
----------
- [1,2,3]
-(1 row)
-
-SELECT ' [ 1,  2 ,    3  ] '::halfvec;
- halfvec 
----------
- [1,2,3]
-(1 row)
-
-SELECT '[1.23456]'::halfvec;
-  halfvec   
-------------
- [1.234375]
-(1 row)
-
-SELECT '[hello,1]'::halfvec;
-ERROR:  invalid input syntax for type halfvec: "[hello,1]"
-LINE 1: SELECT '[hello,1]'::halfvec;
-               ^
-SELECT '[NaN,1]'::halfvec;
-ERROR:  NaN not allowed in halfvec
-LINE 1: SELECT '[NaN,1]'::halfvec;
-               ^
-SELECT '[Infinity,1]'::halfvec;
-ERROR:  infinite value not allowed in halfvec
-LINE 1: SELECT '[Infinity,1]'::halfvec;
-               ^
-SELECT '[-Infinity,1]'::halfvec;
-ERROR:  infinite value not allowed in halfvec
-LINE 1: SELECT '[-Infinity,1]'::halfvec;
-               ^
-SELECT '[65519,-65519]'::halfvec;
-    halfvec     
-----------------
- [65504,-65504]
-(1 row)
-
-SELECT '[65520,-65520]'::halfvec;
-ERROR:  "65520" is out of range for type halfvec
-LINE 1: SELECT '[65520,-65520]'::halfvec;
-               ^
-SELECT '[1e-8,-1e-8]'::halfvec;
- halfvec 
----------
- [0,-0]
-(1 row)
-
-SELECT '[4e38,1]'::halfvec;
-ERROR:  "4e38" is out of range for type halfvec
-LINE 1: SELECT '[4e38,1]'::halfvec;
-               ^
-SELECT '[1e-46,1]'::halfvec;
- halfvec 
----------
- [0,1]
-(1 row)
-
-SELECT '[1,2,3'::halfvec;
-ERROR:  invalid input syntax for type halfvec: "[1,2,3"
-LINE 1: SELECT '[1,2,3'::halfvec;
-               ^
-SELECT '[1,2,3]9'::halfvec;
-ERROR:  invalid input syntax for type halfvec: "[1,2,3]9"
-LINE 1: SELECT '[1,2,3]9'::halfvec;
-               ^
-DETAIL:  Junk after closing right brace.
-SELECT '1,2,3'::halfvec;
-ERROR:  invalid input syntax for type halfvec: "1,2,3"
-LINE 1: SELECT '1,2,3'::halfvec;
-               ^
-DETAIL:  Vector contents must start with "[".
-SELECT ''::halfvec;
-ERROR:  invalid input syntax for type halfvec: ""
-LINE 1: SELECT ''::halfvec;
-               ^
-DETAIL:  Vector contents must start with "[".
-SELECT '['::halfvec;
-ERROR:  invalid input syntax for type halfvec: "["
-LINE 1: SELECT '['::halfvec;
-               ^
-SELECT '[ '::halfvec;
-ERROR:  invalid input syntax for type halfvec: "[ "
-LINE 1: SELECT '[ '::halfvec;
-               ^
-SELECT '[,'::halfvec;
-ERROR:  invalid input syntax for type halfvec: "[,"
-LINE 1: SELECT '[,'::halfvec;
-               ^
-SELECT '[]'::halfvec;
-ERROR:  halfvec must have at least 1 dimension
-LINE 1: SELECT '[]'::halfvec;
-               ^
-SELECT '[ ]'::halfvec;
-ERROR:  halfvec must have at least 1 dimension
-LINE 1: SELECT '[ ]'::halfvec;
-               ^
-SELECT '[,]'::halfvec;
-ERROR:  invalid input syntax for type halfvec: "[,]"
-LINE 1: SELECT '[,]'::halfvec;
-               ^
-SELECT '[1,]'::halfvec;
-ERROR:  invalid input syntax for type halfvec: "[1,]"
-LINE 1: SELECT '[1,]'::halfvec;
-               ^
-SELECT '[1a]'::halfvec;
-ERROR:  invalid input syntax for type halfvec: "[1a]"
-LINE 1: SELECT '[1a]'::halfvec;
-               ^
-SELECT '[1,,3]'::halfvec;
-ERROR:  invalid input syntax for type halfvec: "[1,,3]"
-LINE 1: SELECT '[1,,3]'::halfvec;
-               ^
-SELECT '[1, ,3]'::halfvec;
-ERROR:  invalid input syntax for type halfvec: "[1, ,3]"
-LINE 1: SELECT '[1, ,3]'::halfvec;
-               ^
-SELECT '[1,2,3]'::halfvec(3);
- halfvec 
----------
- [1,2,3]
-(1 row)
-
-SELECT '[1,2,3]'::halfvec(2);
-ERROR:  expected 2 dimensions, not 3
-SELECT '[1,2,3]'::halfvec(3, 2);
-ERROR:  invalid type modifier
-LINE 1: SELECT '[1,2,3]'::halfvec(3, 2);
-                          ^
-SELECT '[1,2,3]'::halfvec('a');
-ERROR:  invalid input syntax for type integer: "a"
-LINE 1: SELECT '[1,2,3]'::halfvec('a');
-                          ^
-SELECT '[1,2,3]'::halfvec(0);
-ERROR:  dimensions for type halfvec must be at least 1
-LINE 1: SELECT '[1,2,3]'::halfvec(0);
-                          ^
-SELECT '[1,2,3]'::halfvec(16001);
-ERROR:  dimensions for type halfvec cannot exceed 16000
-LINE 1: SELECT '[1,2,3]'::halfvec(16001);
-                          ^
-SELECT unnest('{"[1,2,3]", "[4,5,6]"}'::halfvec[]);
- unnest  
----------
- [1,2,3]
- [4,5,6]
-(2 rows)
-
-SELECT '{"[1,2,3]"}'::halfvec(2)[];
-ERROR:  expected 2 dimensions, not 3

test/expected/hnsw_halfvec_cosine.out

@@ -1,26 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val halfvec_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::halfvec)) t2;
- count 
--------
-     3
-(1 row)
-
-DROP TABLE t;

test/expected/hnsw_halfvec_ip.out

@@ -1,21 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val halfvec_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::halfvec)) t2;
- count 
--------
-     4
-(1 row)
-
-DROP TABLE t;

test/expected/hnsw_halfvec_l1.out

@@ -1,21 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val halfvec_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::halfvec)) t2;
- count 
--------
-     4
-(1 row)
-
-DROP TABLE t;

test/expected/hnsw_halfvec_l2.out

@@ -1,33 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val halfvec_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::halfvec)) 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_hamming.out

@@ -19,11 +19,3 @@ SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <~> (SELECT NULL::bit)) t2;
 (1 row)
 
 DROP TABLE t;
--- TODO move
-CREATE TABLE t (val varbit(3));
-CREATE INDEX ON t USING hnsw (val bit_hamming_ops);
-ERROR:  type not supported for hnsw index
-CREATE INDEX ON t USING hnsw ((val::bit(3)) bit_hamming_ops);
-CREATE INDEX ON t USING hnsw ((val::bit(64001)) bit_hamming_ops);
-ERROR:  column cannot have more than 64000 dimensions for hnsw index
-DROP TABLE t;

test/expected/hnsw_sparsevec_cosine.out

@@ -1,26 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val sparsevec(3));
-INSERT INTO t (val) VALUES ('{}/3'), ('{1:1,2:2,3:3}/3'), ('{1:1,2:1,3:1}/3'), (NULL);
-CREATE INDEX ON t USING hnsw (val sparsevec_cosine_ops);
-INSERT INTO t (val) VALUES ('{1:1,2:2,3:4}/3');
-SELECT * FROM t ORDER BY val <=> '{1:3,2:3,3:3}/3';
-       val       
------------------
- {1:1,2:1,3:1}/3
- {1:1,2:2,3:3}/3
- {1:1,2:2,3:4}/3
-(3 rows)
-
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> '{}/3') t2;
- count 
--------
-     3
-(1 row)
-
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> (SELECT NULL::sparsevec)) t2;
- count 
--------
-     3
-(1 row)
-
-DROP TABLE t;

test/expected/hnsw_sparsevec_ip.out

@@ -1,21 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val sparsevec(3));
-INSERT INTO t (val) VALUES ('{}/3'), ('{1:1,2:2,3:3}/3'), ('{1:1,2:1,3:1}/3'), (NULL);
-CREATE INDEX ON t USING hnsw (val sparsevec_ip_ops);
-INSERT INTO t (val) VALUES ('{1:1,2:2,3:4}/3');
-SELECT * FROM t ORDER BY val <#> '{1:3,2:3,3:3}/3';
-       val       
------------------
- {1:1,2:2,3:4}/3
- {1:1,2:2,3:3}/3
- {1:1,2:1,3:1}/3
- {}/3
-(4 rows)
-
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <#> (SELECT NULL::sparsevec)) t2;
- count 
--------
-     4
-(1 row)
-
-DROP TABLE t;

test/expected/hnsw_sparsevec_l1.out

@@ -1,21 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val sparsevec(3));
-INSERT INTO t (val) VALUES ('{}/3'), ('{1:1,2:2,3:3}/3'), ('{1:1,2:1,3:1}/3'), (NULL);
-CREATE INDEX ON t USING hnsw (val sparsevec_l1_ops);
-INSERT INTO t (val) VALUES ('{1:1,2:2,3:4}/3');
-SELECT * FROM t ORDER BY val <+> '{1:3,2:3,3:3}/3';
-       val       
------------------
- {1:1,2:2,3:3}/3
- {1:1,2:2,3:4}/3
- {1:1,2:1,3:1}/3
- {}/3
-(4 rows)
-
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <+> (SELECT NULL::sparsevec)) t2;
- count 
--------
-     4
-(1 row)
-
-DROP TABLE t;

test/expected/hnsw_sparsevec_l2.out

@@ -1,43 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val sparsevec(3));
-INSERT INTO t (val) VALUES ('{}/3'), ('{1:1,2:2,3:3}/3'), ('{1:1,2:1,3:1}/3'), (NULL);
-CREATE INDEX ON t USING hnsw (val sparsevec_l2_ops);
-INSERT INTO t (val) VALUES ('{1:1,2:2,3:4}/3');
-SELECT * FROM t ORDER BY val <-> '{1:3,2:3,3:3}/3';
-       val       
------------------
- {1:1,2:2,3:3}/3
- {1:1,2:2,3:4}/3
- {1:1,2:1,3:1}/3
- {}/3
-(4 rows)
-
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <-> (SELECT NULL::sparsevec)) t2;
- count 
--------
-     4
-(1 row)
-
-SELECT COUNT(*) FROM t;
- count 
--------
-     5
-(1 row)
-
-TRUNCATE t;
-SELECT * FROM t ORDER BY val <-> '{1:3,2:3,3:3}/3';
- val 
------
-(0 rows)
-
-DROP TABLE t;
--- TODO move
-CREATE TABLE t (val sparsevec(1001));
-INSERT INTO t (val) VALUES (array_fill(1, ARRAY[1001])::vector::sparsevec);
-CREATE INDEX ON t USING hnsw (val sparsevec_l2_ops);
-ERROR:  sparsevec cannot have more than 1000 non-zero elements for hnsw index
-TRUNCATE t;
-CREATE INDEX ON t USING hnsw (val sparsevec_l2_ops);
-INSERT INTO t (val) VALUES (array_fill(1, ARRAY[1001])::vector::sparsevec);
-ERROR:  sparsevec cannot have more than 1000 non-zero elements for hnsw index
-DROP TABLE t;

test/expected/hnsw_vector_l1.out

@@ -1,21 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val vector(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val vector_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::vector)) t2;
- count 
--------
-     4
-(1 row)
-
-DROP TABLE t;

test/expected/ivfflat_bit_hamming.out

@@ -1,36 +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 ivfflat (val bit_hamming_ops) WITH (lists = 1);
-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;
--- TODO move
-CREATE TABLE t (val varbit(3));
-CREATE INDEX ON t USING ivfflat (val bit_hamming_ops) WITH (lists = 1);
-ERROR:  type not supported for ivfflat index
-CREATE INDEX ON t USING ivfflat ((val::bit(3)) bit_hamming_ops) WITH (lists = 1);
-NOTICE:  ivfflat index created with little data
-DETAIL:  This will cause low recall.
-HINT:  Drop the index until the table has more data.
-CREATE INDEX ON t USING ivfflat ((val::bit(64001)) bit_hamming_ops) WITH (lists = 1);
-ERROR:  column cannot have more than 64000 dimensions for ivfflat index
-CREATE INDEX ON t USING ivfflat ((val::bit(2)) bit_hamming_ops) WITH (lists = 5);
-NOTICE:  ivfflat index created with little data
-DETAIL:  This will cause low recall.
-HINT:  Drop the index until the table has more data.
-DROP TABLE t;

test/expected/ivfflat_halfvec_cosine.out

@@ -1,26 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING ivfflat (val halfvec_cosine_ops) WITH (lists = 1);
-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::halfvec)) t2;
- count 
--------
-     3
-(1 row)
-
-DROP TABLE t;

test/expected/ivfflat_halfvec_ip.out

@@ -1,21 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING ivfflat (val halfvec_ip_ops) WITH (lists = 1);
-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::halfvec)) t2;
- count 
--------
-     4
-(1 row)
-
-DROP TABLE t;

test/expected/ivfflat_halfvec_l2.out

@@ -1,36 +0,0 @@
-SET enable_seqscan = off;
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING ivfflat (val halfvec_l2_ops) WITH (lists = 1);
-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::halfvec)) t2;
- count 
--------
-     4
-(1 row)
-
-SELECT COUNT(*) FROM t;
- count 
--------
-     5
-(1 row)
-
-TRUNCATE t;
-NOTICE:  ivfflat index created with little data
-DETAIL:  This will cause low recall.
-HINT:  Drop the index until the table has more data.
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
- val 
------
-(0 rows)
-
-DROP TABLE t;

test/expected/ivfflat_l2.out

@@ -12,11 +12,14 @@ SELECT * FROM t ORDER BY val <-> '[3,3,3]';
  [0,0,0]
 (4 rows)
 
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <-> (SELECT NULL::vector)) t2;
+SELECT * FROM t ORDER BY val <-> (SELECT NULL::vector);
- count 
+   val   
--------
+---------
-     4
+ [0,0,0]
-(1 row)
+ [1,1,1]
+ [1,2,3]
+ [1,2,4]
+(4 rows)
 
 SELECT COUNT(*) FROM t;
  count 

test/expected/sparsevec_functions.out

@@ -1,336 +0,0 @@
-SELECT '{1:1,2:2,3:3}/3'::sparsevec < '{1:1,2:2,3:3}/3';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '{1:1,2:2,3:3}/3'::sparsevec < '{1:1,2:2}/2';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '{1:1,2:2,3:3}/3'::sparsevec <= '{1:1,2:2,3:3}/3';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '{1:1,2:2,3:3}/3'::sparsevec <= '{1:1,2:2}/2';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '{1:1,2:2,3:3}/3'::sparsevec = '{1:1,2:2,3:3}/3';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '{1:1,2:2,3:3}/3'::sparsevec = '{1:1,2:2}/2';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '{1:1,2:2,3:3}/3'::sparsevec != '{1:1,2:2,3:3}/3';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '{1:1,2:2,3:3}/3'::sparsevec != '{1:1,2:2}/2';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '{1:1,2:2,3:3}/3'::sparsevec >= '{1:1,2:2,3:3}/3';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '{1:1,2:2,3:3}/3'::sparsevec >= '{1:1,2:2}/2';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT '{1:1,2:2,3:3}/3'::sparsevec > '{1:1,2:2,3:3}/3';
- ?column? 
-----------
- f
-(1 row)
-
-SELECT '{1:1,2:2,3:3}/3'::sparsevec > '{1:1,2:2}/2';
- ?column? 
-----------
- t
-(1 row)
-
-SELECT sparsevec_cmp('{1:1,2:2,3:3}/3', '{1:1,2:2,3:3}/3');
- sparsevec_cmp 
----------------
-             0
-(1 row)
-
-SELECT sparsevec_cmp('{1:1,2:2,3:3}/3', '{}/3');
- sparsevec_cmp 
----------------
-             1
-(1 row)
-
-SELECT sparsevec_cmp('{}/3', '{1:1,2:2,3:3}/3');
- sparsevec_cmp 
----------------
-            -1
-(1 row)
-
-SELECT sparsevec_cmp('{1:1,2:2}/2', '{1:1,2:2,3:3}/3');
- sparsevec_cmp 
----------------
-            -1
-(1 row)
-
-SELECT sparsevec_cmp('{1:1,2:2,3:3}/3', '{1:1,2:2}/2');
- sparsevec_cmp 
----------------
-             1
-(1 row)
-
-SELECT sparsevec_cmp('{1:1,2:2}/2', '{1:2,2:3,3:4}/3');
- sparsevec_cmp 
----------------
-            -1
-(1 row)
-
-SELECT sparsevec_cmp('{1:2,2:3}/2', '{1:1,2:2,3:3}/3');
- sparsevec_cmp 
----------------
-             1
-(1 row)
-
-SELECT round(l2_norm('{1:1,2:1}/2'::sparsevec)::numeric, 5);
-  round  
----------
- 1.41421
-(1 row)
-
-SELECT l2_norm('{1:3,2:4}/2'::sparsevec);
- l2_norm 
----------
-       5
-(1 row)
-
-SELECT l2_norm('{2:1}/2'::sparsevec);
- l2_norm 
----------
-       1
-(1 row)
-
-SELECT l2_norm('{1:3e37,2:4e37}/2'::sparsevec)::real;
- l2_norm 
----------
-   5e+37
-(1 row)
-
-SELECT l2_distance('{}/2'::sparsevec, '{1:3,2:4}/2');
- l2_distance 
--------------
-           5
-(1 row)
-
-SELECT l2_distance('{1:3}/2'::sparsevec, '{2:4}/2');
- l2_distance 
--------------
-           5
-(1 row)
-
-SELECT l2_distance('{2:4}/2'::sparsevec, '{1:3}/2');
- l2_distance 
--------------
-           5
-(1 row)
-
-SELECT l2_distance('{}/2'::sparsevec, '{2:1}/2');
- l2_distance 
--------------
-           1
-(1 row)
-
-SELECT '{}/2'::sparsevec <-> '{1:3,2:4}/2';
- ?column? 
-----------
-        5
-(1 row)
-
-SELECT inner_product('{1:1,2:2}/2'::sparsevec, '{1:2,2:4}/2');
- inner_product 
----------------
-            10
-(1 row)
-
-SELECT inner_product('{1:1,2:2}/2'::sparsevec, '{1:3}/1');
-ERROR:  different sparsevec dimensions 2 and 1
-SELECT inner_product('{1:3e38}/1'::sparsevec, '{1:3e38}/1');
- inner_product 
----------------
-      Infinity
-(1 row)
-
-SELECT inner_product('{1:1,3:3,5:5}/5'::sparsevec, '{2:4,3:6,4:8}/5');
- inner_product 
----------------
-            18
-(1 row)
-
-SELECT '{1:1,2:2}/2'::sparsevec <#> '{1:3,2:4}/2';
- ?column? 
-----------
-      -11
-(1 row)
-
-SELECT cosine_distance('{1:1,2:2}/2'::sparsevec, '{1:2,2:4}/2');
- cosine_distance 
------------------
-               0
-(1 row)
-
-SELECT cosine_distance('{1:1,2:2}/2'::sparsevec, '{}/2');
- cosine_distance 
------------------
-             NaN
-(1 row)
-
-SELECT cosine_distance('{1:1,2:1}/2'::sparsevec, '{1:1,2:1}/2');
- cosine_distance 
------------------
-               0
-(1 row)
-
-SELECT cosine_distance('{1:1}/2'::sparsevec, '{2:2}/2');
- cosine_distance 
------------------
-               1
-(1 row)
-
-SELECT cosine_distance('{1:1,2:1}/2'::sparsevec, '{1:-1,2:-1}/2');
- cosine_distance 
------------------
-               2
-(1 row)
-
-SELECT cosine_distance('{1:2}/2'::sparsevec, '{2:2}/2');
- cosine_distance 
------------------
-               1
-(1 row)
-
-SELECT cosine_distance('{1:1,2:2}/2'::sparsevec, '{1:3}/1');
-ERROR:  different sparsevec dimensions 2 and 1
-SELECT cosine_distance('{1:1,2:1}/2'::sparsevec, '{1:1.1,2:1.1}/2');
- cosine_distance 
------------------
-               0
-(1 row)
-
-SELECT cosine_distance('{1:1,2:1}/2'::sparsevec, '{1:-1.1,2:-1.1}/2');
- cosine_distance 
------------------
-               2
-(1 row)
-
-SELECT cosine_distance('{1:3e38}/1'::sparsevec, '{1:3e38}/1');
- cosine_distance 
------------------
-             NaN
-(1 row)
-
-SELECT cosine_distance('{}/1'::sparsevec, '{}/1');
- cosine_distance 
------------------
-             NaN
-(1 row)
-
-SELECT '{1:1,2:2}/2'::sparsevec <=> '{1:2,2:4}/2';
- ?column? 
-----------
-        0
-(1 row)
-
-SELECT l1_distance('{}/2'::sparsevec, '{1:3,2:4}/2');
- l1_distance 
--------------
-           7
-(1 row)
-
-SELECT l1_distance('{}/2'::sparsevec, '{2:1}/2');
- l1_distance 
--------------
-           1
-(1 row)
-
-SELECT l1_distance('{1:1,2:2}/2'::sparsevec, '{1:3}/1');
-ERROR:  different sparsevec dimensions 2 and 1
-SELECT l1_distance('{1:3e38}/1'::sparsevec, '{1:-3e38}/1');
- l1_distance 
--------------
-    Infinity
-(1 row)
-
-SELECT l1_distance('{1:1,3:3,5:5,7:7}/8'::sparsevec, '{2:2,4:4,6:6,8:8}/8');
- l1_distance 
--------------
-          36
-(1 row)
-
-SELECT l1_distance('{1:1,3:3,5:5,7:7,9:9}/9'::sparsevec, '{2:2,4:4,6:6,8:8}/9');
- l1_distance 
--------------
-          45
-(1 row)
-
-SELECT l2_normalize('{1:3,2:4}/2'::sparsevec);
-  l2_normalize   
------------------
- {1:0.6,2:0.8}/2
-(1 row)
-
-SELECT l2_normalize('{1:3}/2'::sparsevec);
- l2_normalize 
---------------
- {1:1}/2
-(1 row)
-
-SELECT l2_normalize('{2:0.1}/2'::sparsevec);
- l2_normalize 
---------------
- {2:1}/2
-(1 row)
-
-SELECT l2_normalize('{}/2'::sparsevec);
- l2_normalize 
---------------
- {}/2
-(1 row)
-
-SELECT l2_normalize('{1:3e38}/1'::sparsevec);
- l2_normalize 
---------------
- {1:1}/1
-(1 row)
-
-SELECT l2_normalize('{1:3e38,2:1e-37}/2'::sparsevec);
- l2_normalize 
---------------
- {1:1}/2
-(1 row)
-
-SELECT l2_normalize('{2:3e37,4:3e-37,6:4e37,8:4e-37}/9'::sparsevec);
-  l2_normalize   
------------------
- {2:0.6,6:0.8}/9
-(1 row)
-

test/expected/sparsevec_input.out

@@ -1,225 +0,0 @@
-SELECT '{1:1.5,3:3.5}/5'::sparsevec;
-    sparsevec    
------------------
- {1:1.5,3:3.5}/5
-(1 row)
-
-SELECT '{1:-2,3:-4}/5'::sparsevec;
-   sparsevec   
----------------
- {1:-2,3:-4}/5
-(1 row)
-
-SELECT '{1:2.,3:4.}/5'::sparsevec;
-  sparsevec  
--------------
- {1:2,3:4}/5
-(1 row)
-
-SELECT ' { 1 : 1.5 ,  3  :  3.5  } / 5 '::sparsevec;
-    sparsevec    
------------------
- {1:1.5,3:3.5}/5
-(1 row)
-
-SELECT '{1:1.23456}/1'::sparsevec;
-   sparsevec   
----------------
- {1:1.23456}/1
-(1 row)
-
-SELECT '{1:hello,2:1}/2'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{1:hello,2:1}/2"
-LINE 1: SELECT '{1:hello,2:1}/2'::sparsevec;
-               ^
-SELECT '{1:NaN,2:1}/2'::sparsevec;
-ERROR:  NaN not allowed in sparsevec
-LINE 1: SELECT '{1:NaN,2:1}/2'::sparsevec;
-               ^
-SELECT '{1:Infinity,2:1}/2'::sparsevec;
-ERROR:  infinite value not allowed in sparsevec
-LINE 1: SELECT '{1:Infinity,2:1}/2'::sparsevec;
-               ^
-SELECT '{1:-Infinity,2:1}/2'::sparsevec;
-ERROR:  infinite value not allowed in sparsevec
-LINE 1: SELECT '{1:-Infinity,2:1}/2'::sparsevec;
-               ^
-SELECT '{1:1.5e38,2:-1.5e38}/2'::sparsevec;
-        sparsevec         
---------------------------
- {1:1.5e+38,2:-1.5e+38}/2
-(1 row)
-
-SELECT '{1:1.5e+38,2:-1.5e+38}/2'::sparsevec;
-        sparsevec         
---------------------------
- {1:1.5e+38,2:-1.5e+38}/2
-(1 row)
-
-SELECT '{1:1.5e-38,2:-1.5e-38}/2'::sparsevec;
-        sparsevec         
---------------------------
- {1:1.5e-38,2:-1.5e-38}/2
-(1 row)
-
-SELECT '{1:4e38,2:1}/2'::sparsevec;
-ERROR:  "4e38" is out of range for type sparsevec
-LINE 1: SELECT '{1:4e38,2:1}/2'::sparsevec;
-               ^
-SELECT '{1:-4e38,2:1}/2'::sparsevec;
-ERROR:  "-4e38" is out of range for type sparsevec
-LINE 1: SELECT '{1:-4e38,2:1}/2'::sparsevec;
-               ^
-SELECT '{1:1e-46,2:1}/2'::sparsevec;
-ERROR:  "1e-46" is out of range for type sparsevec
-LINE 1: SELECT '{1:1e-46,2:1}/2'::sparsevec;
-               ^
-SELECT '{1:-1e-46,2:1}/2'::sparsevec;
-ERROR:  "-1e-46" is out of range for type sparsevec
-LINE 1: SELECT '{1:-1e-46,2:1}/2'::sparsevec;
-               ^
-SELECT ''::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: ""
-LINE 1: SELECT ''::sparsevec;
-               ^
-DETAIL:  Vector contents must start with "{".
-SELECT '{'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{"
-LINE 1: SELECT '{'::sparsevec;
-               ^
-SELECT '{ '::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{ "
-LINE 1: SELECT '{ '::sparsevec;
-               ^
-SELECT '{:'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{:"
-LINE 1: SELECT '{:'::sparsevec;
-               ^
-SELECT '{,'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{,"
-LINE 1: SELECT '{,'::sparsevec;
-               ^
-SELECT '{}'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{}"
-LINE 1: SELECT '{}'::sparsevec;
-               ^
-DETAIL:  Unexpected end of input.
-SELECT '{}/'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{}/"
-LINE 1: SELECT '{}/'::sparsevec;
-               ^
-SELECT '{}/1'::sparsevec;
- sparsevec 
------------
- {}/1
-(1 row)
-
-SELECT '{}/1a'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{}/1a"
-LINE 1: SELECT '{}/1a'::sparsevec;
-               ^
-DETAIL:  Junk after closing.
-SELECT '{ }/1'::sparsevec;
- sparsevec 
------------
- {}/1
-(1 row)
-
-SELECT '{:}/1'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{:}/1"
-LINE 1: SELECT '{:}/1'::sparsevec;
-               ^
-SELECT '{,}/1'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{,}/1"
-LINE 1: SELECT '{,}/1'::sparsevec;
-               ^
-SELECT '{1,}/1'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{1,}/1"
-LINE 1: SELECT '{1,}/1'::sparsevec;
-               ^
-SELECT '{:1}/1'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{:1}/1"
-LINE 1: SELECT '{:1}/1'::sparsevec;
-               ^
-SELECT '{1:}/1'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{1:}/1"
-LINE 1: SELECT '{1:}/1'::sparsevec;
-               ^
-SELECT '{1a:1}/1'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{1a:1}/1"
-LINE 1: SELECT '{1a:1}/1'::sparsevec;
-               ^
-SELECT '{1:1a}/1'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{1:1a}/1"
-LINE 1: SELECT '{1:1a}/1'::sparsevec;
-               ^
-SELECT '{1:1,}/1'::sparsevec;
-ERROR:  invalid input syntax for type sparsevec: "{1:1,}/1"
-LINE 1: SELECT '{1:1,}/1'::sparsevec;
-               ^
-SELECT '{1:0,2:1,3:0}/3'::sparsevec;
- sparsevec 
------------
- {2:1}/3
-(1 row)
-
-SELECT '{2:1,1:1}/2'::sparsevec;
-  sparsevec  
--------------
- {1:1,2:1}/2
-(1 row)
-
-SELECT '{1:1,1:1}/2'::sparsevec;
-ERROR:  indexes must not contain duplicates
-LINE 1: SELECT '{1:1,1:1}/2'::sparsevec;
-               ^
-SELECT '{1:1,2:1,1:1}/2'::sparsevec;
-ERROR:  indexes must not contain duplicates
-LINE 1: SELECT '{1:1,2:1,1:1}/2'::sparsevec;
-               ^
-SELECT '{}/5'::sparsevec;
- sparsevec 
------------
- {}/5
-(1 row)
-
-SELECT '{}/-1'::sparsevec;
-ERROR:  sparsevec must have at least 1 dimension
-LINE 1: SELECT '{}/-1'::sparsevec;
-               ^
-SELECT '{}/100001'::sparsevec;
-ERROR:  sparsevec cannot have more than 100000 dimensions
-LINE 1: SELECT '{}/100001'::sparsevec;
-               ^
-SELECT '{0:1}/1'::sparsevec;
-ERROR:  index "0" is out of range for type sparsevec
-LINE 1: SELECT '{0:1}/1'::sparsevec;
-               ^
-SELECT '{2:1}/1'::sparsevec;
-ERROR:  index must be less than or equal to dimensions
-LINE 1: SELECT '{2:1}/1'::sparsevec;
-               ^
-SELECT '{}/3'::sparsevec(3);
- sparsevec 
------------
- {}/3
-(1 row)
-
-SELECT '{}/3'::sparsevec(2);
-ERROR:  expected 2 dimensions, not 3
-SELECT '{}/3'::sparsevec(3, 2);
-ERROR:  invalid type modifier
-LINE 1: SELECT '{}/3'::sparsevec(3, 2);
-                       ^
-SELECT '{}/3'::sparsevec('a');
-ERROR:  invalid input syntax for type integer: "a"
-LINE 1: SELECT '{}/3'::sparsevec('a');
-                       ^
-SELECT '{}/3'::sparsevec(0);
-ERROR:  dimensions for type sparsevec must be at least 1
-LINE 1: SELECT '{}/3'::sparsevec(0);
-                       ^
-SELECT '{}/3'::sparsevec(100001);
-ERROR:  dimensions for type sparsevec cannot exceed 100000
-LINE 1: SELECT '{}/3'::sparsevec(100001);
-                       ^

test/expected/vector_functions.out

@@ -6,8 +6,6 @@ SELECT '[1,2,3]'::vector + '[4,5,6]';
 
 SELECT '[3e38]'::vector + '[3e38]';
 ERROR:  value out of range: overflow
-SELECT '[1,2]'::vector + '[3]';
-ERROR:  different vector dimensions 2 and 1
 SELECT '[1,2,3]'::vector - '[4,5,6]';
   ?column?  
 ------------
@@ -16,8 +14,6 @@ SELECT '[1,2,3]'::vector - '[4,5,6]';
 
 SELECT '[-3e38]'::vector - '[3e38]';
 ERROR:  value out of range: overflow
-SELECT '[1,2]'::vector - '[3]';
-ERROR:  different vector dimensions 2 and 1
 SELECT '[1,2,3]'::vector * '[4,5,6]';
  ?column?  
 -----------
@@ -28,15 +24,13 @@ 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]'::vector * '[3]';
+SELECT '[1,2,3]'::vector || '[4,5]'::vector;
-ERROR:  different vector dimensions 2 and 1
-SELECT '[1,2,3]'::vector || '[4,5]';
   ?column?   
 -------------
  [1,2,3,4,5]
 (1 row)
 
-SELECT array_fill(0, ARRAY[16000])::vector || '[1]';
+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? 
@@ -152,7 +146,7 @@ SELECT vector_cmp('[2,3]', '[1,2,3]');
           1
 (1 row)
 
-SELECT vector_dims('[1,2,3]'::vector);
+SELECT vector_dims('[1,2,3]');
  vector_dims 
 -------------
            3
@@ -202,18 +196,6 @@ SELECT l2_distance('[3e38]'::vector, '[-3e38]');
     Infinity
 (1 row)
 
-SELECT l2_distance('[1,1,1,1,1,1,1,1,1]'::vector, '[1,1,1,1,1,1,1,4,5]');
- l2_distance 
--------------
-           5
-(1 row)
-
-SELECT '[0,0]'::vector <-> '[3,4]';
- ?column? 
-----------
-        5
-(1 row)
-
 SELECT inner_product('[1,2]'::vector, '[3,4]');
  inner_product 
 ---------------
@@ -228,18 +210,6 @@ SELECT inner_product('[3e38]'::vector, '[3e38]');
       Infinity
 (1 row)
 
-SELECT inner_product('[1,1,1,1,1,1,1,1,1]'::vector, '[1,2,3,4,5,6,7,8,9]');
- inner_product 
----------------
-            45
-(1 row)
-
-SELECT '[1,2]'::vector <#> '[3,4]';
- ?column? 
-----------
-      -11
-(1 row)
-
 SELECT cosine_distance('[1,2]'::vector, '[2,4]');
  cosine_distance 
 -----------------
@@ -290,24 +260,6 @@ SELECT cosine_distance('[3e38]'::vector, '[3e38]');
              NaN
 (1 row)
 
-SELECT cosine_distance('[1,2,3,4,5,6,7,8,9]'::vector, '[1,2,3,4,5,6,7,8,9]');
- cosine_distance 
------------------
-               0
-(1 row)
-
-SELECT cosine_distance('[1,2,3,4,5,6,7,8,9]'::vector, '[-1,-2,-3,-4,-5,-6,-7,-8,-9]');
- cosine_distance 
------------------
-               2
-(1 row)
-
-SELECT '[1,2]'::vector <=> '[2,4]';
- ?column? 
-----------
-        0
-(1 row)
-
 SELECT l1_distance('[0,0]'::vector, '[3,4]');
  l1_distance 
 -------------
@@ -328,95 +280,47 @@ SELECT l1_distance('[3e38]'::vector, '[-3e38]');
     Infinity
 (1 row)
 
-SELECT l1_distance('[1,2,3,4,5,6,7,8,9]'::vector, '[1,2,3,4,5,6,7,8,9]');
+SELECT quantize_binary('[1,0,-1]');
- l1_distance 
+ quantize_binary 
--------------
-           0
-(1 row)
-
-SELECT l1_distance('[1,2,3,4,5,6,7,8,9]'::vector, '[0,3,2,5,4,7,6,9,8]');
- l1_distance 
--------------
-           9
-(1 row)
-
-SELECT '[0,0]'::vector <+> '[3,4]';
- ?column? 
-----------
-        7
-(1 row)
-
-SELECT l2_normalize('[3,4]'::vector);
- l2_normalize 
---------------
- [0.6,0.8]
-(1 row)
-
-SELECT l2_normalize('[3,0]'::vector);
- l2_normalize 
---------------
- [1,0]
-(1 row)
-
-SELECT l2_normalize('[0,0.1]'::vector);
- l2_normalize 
---------------
- [0,1]
-(1 row)
-
-SELECT l2_normalize('[0,0]'::vector);
- l2_normalize 
---------------
- [0,0]
-(1 row)
-
-SELECT l2_normalize('[3e38]'::vector);
- l2_normalize 
---------------
- [1]
-(1 row)
-
-SELECT binary_quantize('[1,0,-1]'::vector);
- binary_quantize 
 -----------------
  100
 (1 row)
 
-SELECT binary_quantize('[0,0.1,-0.2,-0.3,0.4,0.5,0.6,-0.7,0.8,-0.9,1]'::vector);
+SELECT quantize_binary('[0,0.1,-0.2,-0.3,0.4,0.5,0.6,-0.7,0.8,-0.9,1]');
- binary_quantize 
+ quantize_binary 
 -----------------
  01001110101
 (1 row)
 
-SELECT subvector('[1,2,3,4,5]'::vector, 1, 3);
+SELECT subvector('[1,2,3,4,5]', 1, 3);
  subvector 
 -----------
  [1,2,3]
 (1 row)
 
-SELECT subvector('[1,2,3,4,5]'::vector, 3, 2);
+SELECT subvector('[1,2,3,4,5]', 3, 2);
  subvector 
 -----------
  [3,4]
 (1 row)
 
-SELECT subvector('[1,2,3,4,5]'::vector, -1, 3);
+SELECT subvector('[1,2,3,4,5]', -1, 3);
  subvector 
 -----------
  [1]
 (1 row)
 
-SELECT subvector('[1,2,3,4,5]'::vector, 3, 9);
+SELECT subvector('[1,2,3,4,5]', 3, 9);
  subvector 
 -----------
  [3,4,5]
 (1 row)
 
-SELECT subvector('[1,2,3,4,5]'::vector, 1, 0);
+SELECT subvector('[1,2,3,4,5]', 1, 0);
 ERROR:  vector must have at least 1 dimension
-SELECT subvector('[1,2,3,4,5]'::vector, 3, -1);
+SELECT subvector('[1,2,3,4,5]', 3, -1);
 ERROR:  vector must have at least 1 dimension
-SELECT subvector('[1,2,3,4,5]'::vector, -1, 2);
+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/vector_input.out

@@ -63,11 +63,11 @@ SELECT '[1.5e-38,-1.5e-38]'::vector;
 (1 row)
 
 SELECT '[4e38,1]'::vector;
-ERROR:  "4e38" is out of range for type vector
+ERROR:  infinite value not allowed in vector
 LINE 1: SELECT '[4e38,1]'::vector;
                ^
 SELECT '[-4e38,1]'::vector;
-ERROR:  "-4e38" is out of range for type vector
+ERROR:  infinite value not allowed in vector
 LINE 1: SELECT '[-4e38,1]'::vector;
                ^
 SELECT '[1e-46,1]'::vector;
@@ -83,48 +83,39 @@ SELECT '[-1e-46,1]'::vector;
 (1 row)
 
 SELECT '[1,2,3'::vector;
-ERROR:  invalid input syntax for type vector: "[1,2,3"
+ERROR:  malformed vector literal: "[1,2,3"
 LINE 1: SELECT '[1,2,3'::vector;
                ^
+DETAIL:  Unexpected end of input.
 SELECT '[1,2,3]9'::vector;
-ERROR:  invalid input syntax for type vector: "[1,2,3]9"
+ERROR:  malformed vector literal: "[1,2,3]9"
 LINE 1: SELECT '[1,2,3]9'::vector;
                ^
 DETAIL:  Junk after closing right brace.
 SELECT '1,2,3'::vector;
-ERROR:  invalid input syntax for type vector: "1,2,3"
+ERROR:  malformed vector literal: "1,2,3"
 LINE 1: SELECT '1,2,3'::vector;
                ^
 DETAIL:  Vector contents must start with "[".
 SELECT ''::vector;
-ERROR:  invalid input syntax for type vector: ""
+ERROR:  malformed vector literal: ""
 LINE 1: SELECT ''::vector;
                ^
 DETAIL:  Vector contents must start with "[".
 SELECT '['::vector;
-ERROR:  invalid input syntax for type vector: "["
+ERROR:  malformed vector literal: "["
 LINE 1: SELECT '['::vector;
                ^
-SELECT '[ '::vector;
+DETAIL:  Unexpected end of input.
-ERROR:  invalid input syntax for type vector: "[ "
-LINE 1: SELECT '[ '::vector;
-               ^
 SELECT '[,'::vector;
-ERROR:  invalid input syntax for type vector: "[,"
+ERROR:  malformed vector literal: "[,"
 LINE 1: SELECT '[,'::vector;
                ^
+DETAIL:  Unexpected end of input.
 SELECT '[]'::vector;
 ERROR:  vector must have at least 1 dimension
 LINE 1: SELECT '[]'::vector;
                ^
-SELECT '[ ]'::vector;
-ERROR:  vector must have at least 1 dimension
-LINE 1: SELECT '[ ]'::vector;
-               ^
-SELECT '[,]'::vector;
-ERROR:  invalid input syntax for type vector: "[,]"
-LINE 1: SELECT '[,]'::vector;
-               ^
 SELECT '[1,]'::vector;
 ERROR:  invalid input syntax for type vector: "[1,]"
 LINE 1: SELECT '[1,]'::vector;
@@ -134,7 +125,7 @@ ERROR:  invalid input syntax for type vector: "[1a]"
 LINE 1: SELECT '[1a]'::vector;
                ^
 SELECT '[1,,3]'::vector;
-ERROR:  invalid input syntax for type vector: "[1,,3]"
+ERROR:  malformed vector literal: "[1,,3]"
 LINE 1: SELECT '[1,,3]'::vector;
                ^
 SELECT '[1, ,3]'::vector;

test/sql/bit_functions.sql

@@ -1,27 +1,13 @@
-SELECT hamming_distance('111', '111');
+SELECT hamming_distance(B'111', B'111');
-SELECT hamming_distance('111', '110');
+SELECT hamming_distance(B'111', B'110');
-SELECT hamming_distance('111', '100');
+SELECT hamming_distance(B'111', B'100');
-SELECT hamming_distance('111', '000');
+SELECT hamming_distance(B'111', B'000');
-SELECT hamming_distance('10101010101010101010', '01010101010101010101');
+SELECT hamming_distance(B'111', B'00');
-SELECT hamming_distance('101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101', '101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101');
-SELECT hamming_distance('101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101', '010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010');
-SELECT hamming_distance('110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011', '100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001');
-SELECT hamming_distance('', '');
-SELECT hamming_distance('111', '00');
-SELECT hamming_distance('111', '000'::varbit(4));
-SELECT hamming_distance('111', '0000'::varbit(4));
 
-SELECT jaccard_distance('1111', '1111');
+SELECT jaccard_distance(B'1111', B'1111');
-SELECT jaccard_distance('1111', '1110');
+SELECT jaccard_distance(B'1111', B'1110');
-SELECT jaccard_distance('1111', '1100');
+SELECT jaccard_distance(B'1111', B'1100');
-SELECT jaccard_distance('1111', '1000');
+SELECT jaccard_distance(B'1111', B'1000');
-SELECT jaccard_distance('1111', '0000');
+SELECT jaccard_distance(B'1111', B'0000');
-SELECT jaccard_distance('1100', '1000');
+SELECT jaccard_distance(B'1100', B'1000');
-SELECT jaccard_distance('10101010101010101010', '01010101010101010101');
+SELECT jaccard_distance(B'1111', B'000');
-SELECT jaccard_distance('101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101', '101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101');
-SELECT jaccard_distance('101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101', '010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010');
-SELECT jaccard_distance('110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011', '100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001');
-SELECT jaccard_distance('', '');
-SELECT jaccard_distance('1111', '000');
-SELECT jaccard_distance('1111', '0000'::varbit(5));
-SELECT jaccard_distance('1111', '00000'::varbit(5));

test/sql/btree.sql

@@ -5,6 +5,6 @@ INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
 CREATE INDEX ON t (val);
 
 SELECT * FROM t WHERE val = '[1,2,3]';
-SELECT * FROM t ORDER BY val;
+SELECT * FROM t ORDER BY val LIMIT 1;
 
 DROP TABLE t;

test/sql/btree_halfvec.sql

@@ -1,10 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t (val);
-
-SELECT * FROM t WHERE val = '[1,2,3]';
-SELECT * FROM t ORDER BY val;
-
-DROP TABLE t;

test/sql/btree_sparsevec.sql

@@ -1,10 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val sparsevec(3));
-INSERT INTO t (val) VALUES ('{}/3'), ('{1:1,2:2,3:3}/3'), ('{1:1,2:1,3:1}/3'), (NULL);
-CREATE INDEX ON t (val);
-
-SELECT * FROM t WHERE val = '{1:1,2:2,3:3}/3';
-SELECT * FROM t ORDER BY val;
-
-DROP TABLE t;

test/sql/cast.sql

@@ -3,61 +3,13 @@ SELECT ARRAY[1.0,2.0,3.0]::vector;
 SELECT ARRAY[1,2,3]::float4[]::vector;
 SELECT ARRAY[1,2,3]::float8[]::vector;
 SELECT ARRAY[1,2,3]::numeric[]::vector;
-
-SELECT '[1,2,3]'::vector::real[];
-
-SELECT '{1,2,3}'::real[]::vector;
-SELECT '{1,2,3}'::real[]::vector(3);
-SELECT '{1,2,3}'::real[]::vector(2);
 SELECT '{NULL}'::real[]::vector;
 SELECT '{NaN}'::real[]::vector;
 SELECT '{Infinity}'::real[]::vector;
 SELECT '{-Infinity}'::real[]::vector;
 SELECT '{}'::real[]::vector;
 SELECT '{{1}}'::real[]::vector;
-
+SELECT '[1,2,3]'::vector::real[];
-SELECT '{1,2,3}'::double precision[]::vector;
-SELECT '{1,2,3}'::double precision[]::vector(3);
-SELECT '{1,2,3}'::double precision[]::vector(2);
-SELECT '{4e38,-4e38}'::double precision[]::vector;
-SELECT '{1e-46,-1e-46}'::double precision[]::vector;
-
-SELECT '[1,2,3]'::vector::halfvec;
-SELECT '[1,2,3]'::vector::halfvec(3);
-SELECT '[1,2,3]'::vector::halfvec(2);
-SELECT '[65520]'::vector::halfvec;
-SELECT '[1e-8]'::vector::halfvec;
-
-SELECT '[1,2,3]'::halfvec::vector;
-SELECT '[1,2,3]'::halfvec::vector(3);
-SELECT '[1,2,3]'::halfvec::vector(2);
-
-SELECT '{1,2,3}'::real[]::halfvec;
-SELECT '{1,2,3}'::real[]::halfvec(3);
-SELECT '{1,2,3}'::real[]::halfvec(2);
-SELECT '{65520,-65520}'::real[]::halfvec;
-SELECT '{1e-8,-1e-8}'::real[]::halfvec;
-
-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);
-
-SELECT '{2:1.5,4:3.5}/5'::sparsevec::vector;
-SELECT '{2:1.5,4:3.5}/5'::sparsevec::vector(5);
-SELECT '{2:1.5,4:3.5}/5'::sparsevec::vector(4);
-SELECT '{}/16001'::sparsevec::vector;
-
-SELECT '[0,1.5,0,3.5,0]'::halfvec::sparsevec;
-SELECT '[0,1.5,0,3.5,0]'::halfvec::sparsevec(5);
-SELECT '[0,1.5,0,3.5,0]'::halfvec::sparsevec(4);
-
-SELECT '{2:1.5,4:3.5}/5'::sparsevec::halfvec;
-SELECT '{2:1.5,4:3.5}/5'::sparsevec::halfvec(5);
-SELECT '{2:1.5,4:3.5}/5'::sparsevec::halfvec(4);
-SELECT '{}/16001'::sparsevec::halfvec;
-SELECT '{1:65520}/1'::sparsevec::halfvec;
-SELECT '{1:1e-8}/1'::sparsevec::halfvec;
-
 SELECT array_agg(n)::vector FROM generate_series(1, 16001) n;
 SELECT array_to_vector(array_agg(n), 16001, false) FROM generate_series(1, 16001) n;
 

test/sql/copy.sql

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

test/sql/halfvec_functions.sql

@@ -1,103 +0,0 @@
-SELECT '[1,2,3]'::halfvec + '[4,5,6]';
-SELECT '[65519]'::halfvec + '[65519]';
-SELECT '[1,2]'::halfvec + '[3]';
-
-SELECT '[1,2,3]'::halfvec - '[4,5,6]';
-SELECT '[-65519]'::halfvec - '[65519]';
-SELECT '[1,2]'::halfvec - '[3]';
-
-SELECT '[1,2,3]'::halfvec * '[4,5,6]';
-SELECT '[65519]'::halfvec * '[65519]';
-SELECT '[1e-7]'::halfvec * '[1e-7]';
-SELECT '[1,2]'::halfvec * '[3]';
-
-SELECT '[1,2,3]'::halfvec || '[4,5]';
-SELECT array_fill(0, ARRAY[16000])::halfvec || '[1]';
-
-SELECT '[1,2,3]'::halfvec < '[1,2,3]';
-SELECT '[1,2,3]'::halfvec < '[1,2]';
-SELECT '[1,2,3]'::halfvec <= '[1,2,3]';
-SELECT '[1,2,3]'::halfvec <= '[1,2]';
-SELECT '[1,2,3]'::halfvec = '[1,2,3]';
-SELECT '[1,2,3]'::halfvec = '[1,2]';
-SELECT '[1,2,3]'::halfvec != '[1,2,3]';
-SELECT '[1,2,3]'::halfvec != '[1,2]';
-SELECT '[1,2,3]'::halfvec >= '[1,2,3]';
-SELECT '[1,2,3]'::halfvec >= '[1,2]';
-SELECT '[1,2,3]'::halfvec > '[1,2,3]';
-SELECT '[1,2,3]'::halfvec > '[1,2]';
-
-SELECT halfvec_cmp('[1,2,3]', '[1,2,3]');
-SELECT halfvec_cmp('[1,2,3]', '[0,0,0]');
-SELECT halfvec_cmp('[0,0,0]', '[1,2,3]');
-SELECT halfvec_cmp('[1,2]', '[1,2,3]');
-SELECT halfvec_cmp('[1,2,3]', '[1,2]');
-SELECT halfvec_cmp('[1,2]', '[2,3,4]');
-SELECT halfvec_cmp('[2,3]', '[1,2,3]');
-
-SELECT vector_dims('[1,2,3]'::halfvec);
-
-SELECT round(l2_norm('[1,1]'::halfvec)::numeric, 5);
-SELECT l2_norm('[3,4]'::halfvec);
-SELECT l2_norm('[0,1]'::halfvec);
-
-SELECT l2_distance('[0,0]'::halfvec, '[3,4]');
-SELECT l2_distance('[0,0]'::halfvec, '[0,1]');
-SELECT l2_distance('[1,2]'::halfvec, '[3]');
-SELECT l2_distance('[1,1,1,1,1,1,1,1,1]'::halfvec, '[1,1,1,1,1,1,1,4,5]');
-SELECT '[0,0]'::halfvec <-> '[3,4]';
-
-SELECT inner_product('[1,2]'::halfvec, '[3,4]');
-SELECT inner_product('[1,2]'::halfvec, '[3]');
-SELECT inner_product('[65504]'::halfvec, '[65504]');
-SELECT inner_product('[1,1,1,1,1,1,1,1,1]'::halfvec, '[1,2,3,4,5,6,7,8,9]');
-SELECT '[1,2]'::halfvec <#> '[3,4]';
-
-SELECT cosine_distance('[1,2]'::halfvec, '[2,4]');
-SELECT cosine_distance('[1,2]'::halfvec, '[0,0]');
-SELECT cosine_distance('[1,1]'::halfvec, '[1,1]');
-SELECT cosine_distance('[1,0]'::halfvec, '[0,2]');
-SELECT cosine_distance('[1,1]'::halfvec, '[-1,-1]');
-SELECT cosine_distance('[1,2]'::halfvec, '[3]');
-SELECT cosine_distance('[1,1]'::halfvec, '[1.1,1.1]');
-SELECT cosine_distance('[1,1]'::halfvec, '[-1.1,-1.1]');
-SELECT cosine_distance('[1,2,3,4,5,6,7,8,9]'::halfvec, '[1,2,3,4,5,6,7,8,9]');
-SELECT cosine_distance('[1,2,3,4,5,6,7,8,9]'::halfvec, '[-1,-2,-3,-4,-5,-6,-7,-8,-9]');
-SELECT '[1,2]'::halfvec <=> '[2,4]';
-
-SELECT l1_distance('[0,0]'::halfvec, '[3,4]');
-SELECT l1_distance('[0,0]'::halfvec, '[0,1]');
-SELECT l1_distance('[1,2]'::halfvec, '[3]');
-SELECT l1_distance('[1,2,3,4,5,6,7,8,9]'::halfvec, '[1,2,3,4,5,6,7,8,9]');
-SELECT l1_distance('[1,2,3,4,5,6,7,8,9]'::halfvec, '[0,3,2,5,4,7,6,9,8]');
-SELECT '[0,0]'::halfvec <+> '[3,4]';
-
-SELECT l2_normalize('[3,4]'::halfvec);
-SELECT l2_normalize('[3,0]'::halfvec);
-SELECT l2_normalize('[0,0.1]'::halfvec);
-SELECT l2_normalize('[0,0]'::halfvec);
-SELECT l2_normalize('[65504]'::halfvec);
-
-SELECT binary_quantize('[1,0,-1]'::halfvec);
-SELECT binary_quantize('[0,0.1,-0.2,-0.3,0.4,0.5,0.6,-0.7,0.8,-0.9,1]'::halfvec);
-
-SELECT subvector('[1,2,3,4,5]'::halfvec, 1, 3);
-SELECT subvector('[1,2,3,4,5]'::halfvec, 3, 2);
-SELECT subvector('[1,2,3,4,5]'::halfvec, -1, 3);
-SELECT subvector('[1,2,3,4,5]'::halfvec, 3, 9);
-SELECT subvector('[1,2,3,4,5]'::halfvec, 1, 0);
-SELECT subvector('[1,2,3,4,5]'::halfvec, 3, -1);
-SELECT subvector('[1,2,3,4,5]'::halfvec, -1, 2);
-
-SELECT avg(v) FROM unnest(ARRAY['[1,2,3]'::halfvec, '[3,5,7]']) v;
-SELECT avg(v) FROM unnest(ARRAY['[1,2,3]'::halfvec, '[3,5,7]', NULL]) v;
-SELECT avg(v) FROM unnest(ARRAY[]::halfvec[]) v;
-SELECT avg(v) FROM unnest(ARRAY['[1,2]'::halfvec, '[3]']) v;
-SELECT avg(v) FROM unnest(ARRAY['[65504]'::halfvec, '[65504]']) v;
-SELECT halfvec_avg(array_agg(n)) FROM generate_series(1, 16002) n;
-
-SELECT sum(v) FROM unnest(ARRAY['[1,2,3]'::halfvec, '[3,5,7]']) v;
-SELECT sum(v) FROM unnest(ARRAY['[1,2,3]'::halfvec, '[3,5,7]', NULL]) v;
-SELECT sum(v) FROM unnest(ARRAY[]::halfvec[]) v;
-SELECT sum(v) FROM unnest(ARRAY['[1,2]'::halfvec, '[3]']) v;
-SELECT sum(v) FROM unnest(ARRAY['[65504]'::halfvec, '[65504]']) v;

test/sql/halfvec_input.sql

@@ -1,38 +0,0 @@
-SELECT '[1,2,3]'::halfvec;
-SELECT '[-1,-2,-3]'::halfvec;
-SELECT '[1.,2.,3.]'::halfvec;
-SELECT ' [ 1,  2 ,    3  ] '::halfvec;
-SELECT '[1.23456]'::halfvec;
-SELECT '[hello,1]'::halfvec;
-SELECT '[NaN,1]'::halfvec;
-SELECT '[Infinity,1]'::halfvec;
-SELECT '[-Infinity,1]'::halfvec;
-SELECT '[65519,-65519]'::halfvec;
-SELECT '[65520,-65520]'::halfvec;
-SELECT '[1e-8,-1e-8]'::halfvec;
-SELECT '[4e38,1]'::halfvec;
-SELECT '[1e-46,1]'::halfvec;
-SELECT '[1,2,3'::halfvec;
-SELECT '[1,2,3]9'::halfvec;
-SELECT '1,2,3'::halfvec;
-SELECT ''::halfvec;
-SELECT '['::halfvec;
-SELECT '[ '::halfvec;
-SELECT '[,'::halfvec;
-SELECT '[]'::halfvec;
-SELECT '[ ]'::halfvec;
-SELECT '[,]'::halfvec;
-SELECT '[1,]'::halfvec;
-SELECT '[1a]'::halfvec;
-SELECT '[1,,3]'::halfvec;
-SELECT '[1, ,3]'::halfvec;
-
-SELECT '[1,2,3]'::halfvec(3);
-SELECT '[1,2,3]'::halfvec(2);
-SELECT '[1,2,3]'::halfvec(3, 2);
-SELECT '[1,2,3]'::halfvec('a');
-SELECT '[1,2,3]'::halfvec(0);
-SELECT '[1,2,3]'::halfvec(16001);
-
-SELECT unnest('{"[1,2,3]", "[4,5,6]"}'::halfvec[]);
-SELECT '{"[1,2,3]"}'::halfvec(2)[];

test/sql/hnsw_halfvec_cosine.sql

@@ -1,13 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val halfvec_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::halfvec)) t2;
-
-DROP TABLE t;

test/sql/hnsw_halfvec_ip.sql

@@ -1,12 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val halfvec_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::halfvec)) t2;
-
-DROP TABLE t;

test/sql/hnsw_halfvec_l1.sql

@@ -1,12 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val halfvec_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::halfvec)) t2;
-
-DROP TABLE t;

test/sql/hnsw_halfvec_l2.sql

@@ -1,16 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val halfvec_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::halfvec)) t2;
-SELECT COUNT(*) FROM t;
-
-TRUNCATE t;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-DROP TABLE t;

test/sql/hnsw_hamming.sql

@@ -10,10 +10,3 @@ SELECT * FROM t ORDER BY val <~> B'111';
 SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <~> (SELECT NULL::bit)) t2;
 
 DROP TABLE t;
-
--- TODO move
-CREATE TABLE t (val varbit(3));
-CREATE INDEX ON t USING hnsw (val bit_hamming_ops);
-CREATE INDEX ON t USING hnsw ((val::bit(3)) bit_hamming_ops);
-CREATE INDEX ON t USING hnsw ((val::bit(64001)) bit_hamming_ops);
-DROP TABLE t;

test/sql/hnsw_sparsevec_cosine.sql

@@ -1,13 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val sparsevec(3));
-INSERT INTO t (val) VALUES ('{}/3'), ('{1:1,2:2,3:3}/3'), ('{1:1,2:1,3:1}/3'), (NULL);
-CREATE INDEX ON t USING hnsw (val sparsevec_cosine_ops);
-
-INSERT INTO t (val) VALUES ('{1:1,2:2,3:4}/3');
-
-SELECT * FROM t ORDER BY val <=> '{1:3,2:3,3:3}/3';
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> '{}/3') t2;
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <=> (SELECT NULL::sparsevec)) t2;
-
-DROP TABLE t;

test/sql/hnsw_sparsevec_ip.sql

@@ -1,12 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val sparsevec(3));
-INSERT INTO t (val) VALUES ('{}/3'), ('{1:1,2:2,3:3}/3'), ('{1:1,2:1,3:1}/3'), (NULL);
-CREATE INDEX ON t USING hnsw (val sparsevec_ip_ops);
-
-INSERT INTO t (val) VALUES ('{1:1,2:2,3:4}/3');
-
-SELECT * FROM t ORDER BY val <#> '{1:3,2:3,3:3}/3';
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <#> (SELECT NULL::sparsevec)) t2;
-
-DROP TABLE t;

test/sql/hnsw_sparsevec_l1.sql

@@ -1,12 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val sparsevec(3));
-INSERT INTO t (val) VALUES ('{}/3'), ('{1:1,2:2,3:3}/3'), ('{1:1,2:1,3:1}/3'), (NULL);
-CREATE INDEX ON t USING hnsw (val sparsevec_l1_ops);
-
-INSERT INTO t (val) VALUES ('{1:1,2:2,3:4}/3');
-
-SELECT * FROM t ORDER BY val <+> '{1:3,2:3,3:3}/3';
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <+> (SELECT NULL::sparsevec)) t2;
-
-DROP TABLE t;

test/sql/hnsw_sparsevec_l2.sql

@@ -1,25 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val sparsevec(3));
-INSERT INTO t (val) VALUES ('{}/3'), ('{1:1,2:2,3:3}/3'), ('{1:1,2:1,3:1}/3'), (NULL);
-CREATE INDEX ON t USING hnsw (val sparsevec_l2_ops);
-
-INSERT INTO t (val) VALUES ('{1:1,2:2,3:4}/3');
-
-SELECT * FROM t ORDER BY val <-> '{1:3,2:3,3:3}/3';
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <-> (SELECT NULL::sparsevec)) t2;
-SELECT COUNT(*) FROM t;
-
-TRUNCATE t;
-SELECT * FROM t ORDER BY val <-> '{1:3,2:3,3:3}/3';
-
-DROP TABLE t;
-
--- TODO move
-CREATE TABLE t (val sparsevec(1001));
-INSERT INTO t (val) VALUES (array_fill(1, ARRAY[1001])::vector::sparsevec);
-CREATE INDEX ON t USING hnsw (val sparsevec_l2_ops);
-TRUNCATE t;
-CREATE INDEX ON t USING hnsw (val sparsevec_l2_ops);
-INSERT INTO t (val) VALUES (array_fill(1, ARRAY[1001])::vector::sparsevec);
-DROP TABLE t;

test/sql/hnsw_vector_l1.sql

@@ -1,12 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val vector(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING hnsw (val vector_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::vector)) t2;
-
-DROP TABLE t;

test/sql/ivfflat_bit_hamming.sql

@@ -1,20 +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 ivfflat (val bit_hamming_ops) WITH (lists = 1);
-
-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;
-
--- TODO move
-CREATE TABLE t (val varbit(3));
-CREATE INDEX ON t USING ivfflat (val bit_hamming_ops) WITH (lists = 1);
-CREATE INDEX ON t USING ivfflat ((val::bit(3)) bit_hamming_ops) WITH (lists = 1);
-CREATE INDEX ON t USING ivfflat ((val::bit(64001)) bit_hamming_ops) WITH (lists = 1);
-CREATE INDEX ON t USING ivfflat ((val::bit(2)) bit_hamming_ops) WITH (lists = 5);
-DROP TABLE t;

test/sql/ivfflat_halfvec_cosine.sql

@@ -1,13 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING ivfflat (val halfvec_cosine_ops) WITH (lists = 1);
-
-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::halfvec)) t2;
-
-DROP TABLE t;

test/sql/ivfflat_halfvec_ip.sql

@@ -1,12 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING ivfflat (val halfvec_ip_ops) WITH (lists = 1);
-
-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::halfvec)) t2;
-
-DROP TABLE t;

test/sql/ivfflat_halfvec_l2.sql

@@ -1,16 +0,0 @@
-SET enable_seqscan = off;
-
-CREATE TABLE t (val halfvec(3));
-INSERT INTO t (val) VALUES ('[0,0,0]'), ('[1,2,3]'), ('[1,1,1]'), (NULL);
-CREATE INDEX ON t USING ivfflat (val halfvec_l2_ops) WITH (lists = 1);
-
-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::halfvec)) t2;
-SELECT COUNT(*) FROM t;
-
-TRUNCATE t;
-SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-
-DROP TABLE t;

test/sql/ivfflat_l2.sql

@@ -7,7 +7,7 @@ CREATE INDEX ON t USING ivfflat (val vector_l2_ops) WITH (lists = 1);
 INSERT INTO t (val) VALUES ('[1,2,4]');
 
 SELECT * FROM t ORDER BY val <-> '[3,3,3]';
-SELECT COUNT(*) FROM (SELECT * FROM t ORDER BY val <-> (SELECT NULL::vector)) t2;
+SELECT * FROM t ORDER BY val <-> (SELECT NULL::vector);
 SELECT COUNT(*) FROM t;
 
 TRUNCATE t;

test/sql/sparsevec_functions.sql

@@ -1,65 +0,0 @@
-SELECT '{1:1,2:2,3:3}/3'::sparsevec < '{1:1,2:2,3:3}/3';
-SELECT '{1:1,2:2,3:3}/3'::sparsevec < '{1:1,2:2}/2';
-SELECT '{1:1,2:2,3:3}/3'::sparsevec <= '{1:1,2:2,3:3}/3';
-SELECT '{1:1,2:2,3:3}/3'::sparsevec <= '{1:1,2:2}/2';
-SELECT '{1:1,2:2,3:3}/3'::sparsevec = '{1:1,2:2,3:3}/3';
-SELECT '{1:1,2:2,3:3}/3'::sparsevec = '{1:1,2:2}/2';
-SELECT '{1:1,2:2,3:3}/3'::sparsevec != '{1:1,2:2,3:3}/3';
-SELECT '{1:1,2:2,3:3}/3'::sparsevec != '{1:1,2:2}/2';
-SELECT '{1:1,2:2,3:3}/3'::sparsevec >= '{1:1,2:2,3:3}/3';
-SELECT '{1:1,2:2,3:3}/3'::sparsevec >= '{1:1,2:2}/2';
-SELECT '{1:1,2:2,3:3}/3'::sparsevec > '{1:1,2:2,3:3}/3';
-SELECT '{1:1,2:2,3:3}/3'::sparsevec > '{1:1,2:2}/2';
-
-SELECT sparsevec_cmp('{1:1,2:2,3:3}/3', '{1:1,2:2,3:3}/3');
-SELECT sparsevec_cmp('{1:1,2:2,3:3}/3', '{}/3');
-SELECT sparsevec_cmp('{}/3', '{1:1,2:2,3:3}/3');
-SELECT sparsevec_cmp('{1:1,2:2}/2', '{1:1,2:2,3:3}/3');
-SELECT sparsevec_cmp('{1:1,2:2,3:3}/3', '{1:1,2:2}/2');
-SELECT sparsevec_cmp('{1:1,2:2}/2', '{1:2,2:3,3:4}/3');
-SELECT sparsevec_cmp('{1:2,2:3}/2', '{1:1,2:2,3:3}/3');
-
-SELECT round(l2_norm('{1:1,2:1}/2'::sparsevec)::numeric, 5);
-SELECT l2_norm('{1:3,2:4}/2'::sparsevec);
-SELECT l2_norm('{2:1}/2'::sparsevec);
-SELECT l2_norm('{1:3e37,2:4e37}/2'::sparsevec)::real;
-
-SELECT l2_distance('{}/2'::sparsevec, '{1:3,2:4}/2');
-SELECT l2_distance('{1:3}/2'::sparsevec, '{2:4}/2');
-SELECT l2_distance('{2:4}/2'::sparsevec, '{1:3}/2');
-SELECT l2_distance('{}/2'::sparsevec, '{2:1}/2');
-SELECT '{}/2'::sparsevec <-> '{1:3,2:4}/2';
-
-SELECT inner_product('{1:1,2:2}/2'::sparsevec, '{1:2,2:4}/2');
-SELECT inner_product('{1:1,2:2}/2'::sparsevec, '{1:3}/1');
-SELECT inner_product('{1:3e38}/1'::sparsevec, '{1:3e38}/1');
-SELECT inner_product('{1:1,3:3,5:5}/5'::sparsevec, '{2:4,3:6,4:8}/5');
-SELECT '{1:1,2:2}/2'::sparsevec <#> '{1:3,2:4}/2';
-
-SELECT cosine_distance('{1:1,2:2}/2'::sparsevec, '{1:2,2:4}/2');
-SELECT cosine_distance('{1:1,2:2}/2'::sparsevec, '{}/2');
-SELECT cosine_distance('{1:1,2:1}/2'::sparsevec, '{1:1,2:1}/2');
-SELECT cosine_distance('{1:1}/2'::sparsevec, '{2:2}/2');
-SELECT cosine_distance('{1:1,2:1}/2'::sparsevec, '{1:-1,2:-1}/2');
-SELECT cosine_distance('{1:2}/2'::sparsevec, '{2:2}/2');
-SELECT cosine_distance('{1:1,2:2}/2'::sparsevec, '{1:3}/1');
-SELECT cosine_distance('{1:1,2:1}/2'::sparsevec, '{1:1.1,2:1.1}/2');
-SELECT cosine_distance('{1:1,2:1}/2'::sparsevec, '{1:-1.1,2:-1.1}/2');
-SELECT cosine_distance('{1:3e38}/1'::sparsevec, '{1:3e38}/1');
-SELECT cosine_distance('{}/1'::sparsevec, '{}/1');
-SELECT '{1:1,2:2}/2'::sparsevec <=> '{1:2,2:4}/2';
-
-SELECT l1_distance('{}/2'::sparsevec, '{1:3,2:4}/2');
-SELECT l1_distance('{}/2'::sparsevec, '{2:1}/2');
-SELECT l1_distance('{1:1,2:2}/2'::sparsevec, '{1:3}/1');
-SELECT l1_distance('{1:3e38}/1'::sparsevec, '{1:-3e38}/1');
-SELECT l1_distance('{1:1,3:3,5:5,7:7}/8'::sparsevec, '{2:2,4:4,6:6,8:8}/8');
-SELECT l1_distance('{1:1,3:3,5:5,7:7,9:9}/9'::sparsevec, '{2:2,4:4,6:6,8:8}/9');
-
-SELECT l2_normalize('{1:3,2:4}/2'::sparsevec);
-SELECT l2_normalize('{1:3}/2'::sparsevec);
-SELECT l2_normalize('{2:0.1}/2'::sparsevec);
-SELECT l2_normalize('{}/2'::sparsevec);
-SELECT l2_normalize('{1:3e38}/1'::sparsevec);
-SELECT l2_normalize('{1:3e38,2:1e-37}/2'::sparsevec);
-SELECT l2_normalize('{2:3e37,4:3e-37,6:4e37,8:4e-37}/9'::sparsevec);

test/sql/sparsevec_input.sql

@@ -1,50 +0,0 @@
-SELECT '{1:1.5,3:3.5}/5'::sparsevec;
-SELECT '{1:-2,3:-4}/5'::sparsevec;
-SELECT '{1:2.,3:4.}/5'::sparsevec;
-SELECT ' { 1 : 1.5 ,  3  :  3.5  } / 5 '::sparsevec;
-SELECT '{1:1.23456}/1'::sparsevec;
-SELECT '{1:hello,2:1}/2'::sparsevec;
-SELECT '{1:NaN,2:1}/2'::sparsevec;
-SELECT '{1:Infinity,2:1}/2'::sparsevec;
-SELECT '{1:-Infinity,2:1}/2'::sparsevec;
-SELECT '{1:1.5e38,2:-1.5e38}/2'::sparsevec;
-SELECT '{1:1.5e+38,2:-1.5e+38}/2'::sparsevec;
-SELECT '{1:1.5e-38,2:-1.5e-38}/2'::sparsevec;
-SELECT '{1:4e38,2:1}/2'::sparsevec;
-SELECT '{1:-4e38,2:1}/2'::sparsevec;
-SELECT '{1:1e-46,2:1}/2'::sparsevec;
-SELECT '{1:-1e-46,2:1}/2'::sparsevec;
-SELECT ''::sparsevec;
-SELECT '{'::sparsevec;
-SELECT '{ '::sparsevec;
-SELECT '{:'::sparsevec;
-SELECT '{,'::sparsevec;
-SELECT '{}'::sparsevec;
-SELECT '{}/'::sparsevec;
-SELECT '{}/1'::sparsevec;
-SELECT '{}/1a'::sparsevec;
-SELECT '{ }/1'::sparsevec;
-SELECT '{:}/1'::sparsevec;
-SELECT '{,}/1'::sparsevec;
-SELECT '{1,}/1'::sparsevec;
-SELECT '{:1}/1'::sparsevec;
-SELECT '{1:}/1'::sparsevec;
-SELECT '{1a:1}/1'::sparsevec;
-SELECT '{1:1a}/1'::sparsevec;
-SELECT '{1:1,}/1'::sparsevec;
-SELECT '{1:0,2:1,3:0}/3'::sparsevec;
-SELECT '{2:1,1:1}/2'::sparsevec;
-SELECT '{1:1,1:1}/2'::sparsevec;
-SELECT '{1:1,2:1,1:1}/2'::sparsevec;
-SELECT '{}/5'::sparsevec;
-SELECT '{}/-1'::sparsevec;
-SELECT '{}/100001'::sparsevec;
-SELECT '{0:1}/1'::sparsevec;
-SELECT '{2:1}/1'::sparsevec;
-
-SELECT '{}/3'::sparsevec(3);
-SELECT '{}/3'::sparsevec(2);
-SELECT '{}/3'::sparsevec(3, 2);
-SELECT '{}/3'::sparsevec('a');
-SELECT '{}/3'::sparsevec(0);
-SELECT '{}/3'::sparsevec(100001);

test/sql/vector_functions.sql

@@ -1,18 +1,13 @@
 SELECT '[1,2,3]'::vector + '[4,5,6]';
 SELECT '[3e38]'::vector + '[3e38]';
-SELECT '[1,2]'::vector + '[3]';
-
 SELECT '[1,2,3]'::vector - '[4,5,6]';
 SELECT '[-3e38]'::vector - '[3e38]';
-SELECT '[1,2]'::vector - '[3]';
-
 SELECT '[1,2,3]'::vector * '[4,5,6]';
 SELECT '[1e37]'::vector * '[1e37]';
 SELECT '[1e-37]'::vector * '[1e-37]';
-SELECT '[1,2]'::vector * '[3]';
 
-SELECT '[1,2,3]'::vector || '[4,5]';
+SELECT '[1,2,3]'::vector || '[4,5]'::vector;
-SELECT array_fill(0, ARRAY[16000])::vector || '[1]';
+SELECT array_fill(0, ARRAY[16000])::vector || '[1]'::vector;
 
 SELECT '[1,2,3]'::vector < '[1,2,3]';
 SELECT '[1,2,3]'::vector < '[1,2]';
@@ -35,7 +30,7 @@ SELECT vector_cmp('[1,2,3]', '[1,2]');
 SELECT vector_cmp('[1,2]', '[2,3,4]');
 SELECT vector_cmp('[2,3]', '[1,2,3]');
 
-SELECT vector_dims('[1,2,3]'::vector);
+SELECT vector_dims('[1,2,3]');
 
 SELECT round(vector_norm('[1,1]')::numeric, 5);
 SELECT vector_norm('[3,4]');
@@ -46,14 +41,10 @@ SELECT l2_distance('[0,0]'::vector, '[3,4]');
 SELECT l2_distance('[0,0]'::vector, '[0,1]');
 SELECT l2_distance('[1,2]'::vector, '[3]');
 SELECT l2_distance('[3e38]'::vector, '[-3e38]');
-SELECT l2_distance('[1,1,1,1,1,1,1,1,1]'::vector, '[1,1,1,1,1,1,1,4,5]');
-SELECT '[0,0]'::vector <-> '[3,4]';
 
 SELECT inner_product('[1,2]'::vector, '[3,4]');
 SELECT inner_product('[1,2]'::vector, '[3]');
 SELECT inner_product('[3e38]'::vector, '[3e38]');
-SELECT inner_product('[1,1,1,1,1,1,1,1,1]'::vector, '[1,2,3,4,5,6,7,8,9]');
-SELECT '[1,2]'::vector <#> '[3,4]';
 
 SELECT cosine_distance('[1,2]'::vector, '[2,4]');
 SELECT cosine_distance('[1,2]'::vector, '[0,0]');
@@ -64,34 +55,22 @@ SELECT cosine_distance('[1,2]'::vector, '[3]');
 SELECT cosine_distance('[1,1]'::vector, '[1.1,1.1]');
 SELECT cosine_distance('[1,1]'::vector, '[-1.1,-1.1]');
 SELECT cosine_distance('[3e38]'::vector, '[3e38]');
-SELECT cosine_distance('[1,2,3,4,5,6,7,8,9]'::vector, '[1,2,3,4,5,6,7,8,9]');
-SELECT cosine_distance('[1,2,3,4,5,6,7,8,9]'::vector, '[-1,-2,-3,-4,-5,-6,-7,-8,-9]');
-SELECT '[1,2]'::vector <=> '[2,4]';
 
 SELECT l1_distance('[0,0]'::vector, '[3,4]');
 SELECT l1_distance('[0,0]'::vector, '[0,1]');
 SELECT l1_distance('[1,2]'::vector, '[3]');
 SELECT l1_distance('[3e38]'::vector, '[-3e38]');
-SELECT l1_distance('[1,2,3,4,5,6,7,8,9]'::vector, '[1,2,3,4,5,6,7,8,9]');
-SELECT l1_distance('[1,2,3,4,5,6,7,8,9]'::vector, '[0,3,2,5,4,7,6,9,8]');
-SELECT '[0,0]'::vector <+> '[3,4]';
 
-SELECT l2_normalize('[3,4]'::vector);
+SELECT quantize_binary('[1,0,-1]');
-SELECT l2_normalize('[3,0]'::vector);
+SELECT quantize_binary('[0,0.1,-0.2,-0.3,0.4,0.5,0.6,-0.7,0.8,-0.9,1]');
-SELECT l2_normalize('[0,0.1]'::vector);
-SELECT l2_normalize('[0,0]'::vector);
-SELECT l2_normalize('[3e38]'::vector);
 
-SELECT binary_quantize('[1,0,-1]'::vector);
+SELECT subvector('[1,2,3,4,5]', 1, 3);
-SELECT binary_quantize('[0,0.1,-0.2,-0.3,0.4,0.5,0.6,-0.7,0.8,-0.9,1]'::vector);
+SELECT subvector('[1,2,3,4,5]', 3, 2);
-
+SELECT subvector('[1,2,3,4,5]', -1, 3);
-SELECT subvector('[1,2,3,4,5]'::vector, 1, 3);
+SELECT subvector('[1,2,3,4,5]', 3, 9);
-SELECT subvector('[1,2,3,4,5]'::vector, 3, 2);
+SELECT subvector('[1,2,3,4,5]', 1, 0);
-SELECT subvector('[1,2,3,4,5]'::vector, -1, 3);
+SELECT subvector('[1,2,3,4,5]', 3, -1);
-SELECT subvector('[1,2,3,4,5]'::vector, 3, 9);
+SELECT subvector('[1,2,3,4,5]', -1, 2);
-SELECT subvector('[1,2,3,4,5]'::vector, 1, 0);
-SELECT subvector('[1,2,3,4,5]'::vector, 3, -1);
-SELECT subvector('[1,2,3,4,5]'::vector, -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;

test/sql/vector_input.sql

@@ -19,11 +19,8 @@ SELECT '[1,2,3]9'::vector;
 SELECT '1,2,3'::vector;
 SELECT ''::vector;
 SELECT '['::vector;
-SELECT '[ '::vector;
 SELECT '[,'::vector;
 SELECT '[]'::vector;
-SELECT '[ ]'::vector;
-SELECT '[,]'::vector;
 SELECT '[1,]'::vector;
 SELECT '[1a]'::vector;
 SELECT '[1,,3]'::vector;

test/t/003_ivfflat_build_recall.pl

@@ -30,19 +30,18 @@ sub test_recall
 			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);
@@ -82,12 +81,7 @@ for my $i (0 .. $#operators)
 	@expected = ();
 	foreach (@queries)
 	{
-		my $res = $node->safe_psql("postgres", qq(
+		my $res = $node->safe_psql("postgres", "SELECT i FROM tst ORDER BY v $operator '$_' LIMIT $limit;");
-			WITH top AS (
-				SELECT v $operator '$_' AS distance FROM tst ORDER BY distance LIMIT $limit
-			)
-			SELECT i FROM tst WHERE (v $operator '$_') <= (SELECT MAX(distance) FROM top)
-		));
 		push(@expected, $res);
 	}
 
@@ -104,16 +98,8 @@ for my $i (0 .. $#operators)
 		test_recall(1, 0.71, $operator);
 		test_recall(10, 0.95, $operator);
 	}
-
+	# Account for equal distances
-	# Test probes equals lists
+	test_recall(100, 0.9925, $operator);
-	if ($operator eq "<=>")
-	{
-		test_recall(100, 0.9925, $operator);
-	}
-	else
-	{
-		test_recall(100, 1.00, $operator);
-	}
 
 	$node->safe_psql("postgres", "DROP INDEX idx;");
 
@@ -133,16 +119,8 @@ for my $i (0 .. $#operators)
 		test_recall(1, 0.71, $operator);
 		test_recall(10, 0.95, $operator);
 	}
-
+	# Account for equal distances
-	# Test probes equals lists
+	test_recall(100, 0.9925, $operator);
-	if ($operator eq "<=>")
-	{
-		test_recall(100, 0.9925, $operator);
-	}
-	else
-	{
-		test_recall(100, 1.00, $operator);
-	}
 
 	$node->safe_psql("postgres", "DROP INDEX idx;");
 }

test/t/012_hnsw_build_recall.pl

@@ -67,8 +67,8 @@ for (1 .. 20)
 }
 
 # Check each index type
-my @operators = ("<->", "<#>", "<=>", "<+>");
+my @operators = ("<->", "<#>", "<=>");
-my @opclasses = ("vector_l2_ops", "vector_ip_ops", "vector_cosine_ops", "vector_l1_ops");
+my @opclasses = ("vector_l2_ops", "vector_ip_ops", "vector_cosine_ops");
 
 for my $i (0 .. $#operators)
 {